CleanUp solution