TimeTypes #167

Removes redundant files
Clean imports
Cleaning
Cleaning