Formatted times
Deleted unused code