Removal of tools and miscellaneous cleanup