removed timers and some minor prep