Part 1: cleanup resulting from the saveLink(), etc, rename.