Removr timer code which was not ready to be pushed, pt 2