Cleaning up directories from upgrades