Adding some code to CleanUp