To save future grief you need to do both at the same time. While you already have most ecverything off it's not that much extra work or cost.