more cleanup for timing, before testing