Changed cleanUp call flood