Made cleanUp a class method