Really remove the old location
More tweaks