cleanup
Time calcs