more cleanup, timer kept running after end