Current time calculation functions removed and some methods renamed