Add some extra cleanup steps to automate them.