comment out cleanup, let's see if that's the problem