Fixed cleanUp problem