Cleaned up Time classes.