Added CleanUp class