Delete unused code
Optimize time display