Make cleanUp a public API method