cleanup time view 2