TimeTypes #167, #150

- Cleaning