added cleanup timer