Remove unnecessary time variables
Fixes and added debug statements