Remove the old stuff about the directory moves