Removed time module and cleaned up here