extra cleanup task causes hangs on our machines/revert to default one wh...

...ich works