Fixed cleanUp