cleanup task causes hangs on our machines

fix for cleanup since it hangs, and this one actually works...