Removed CleanUp()