* Use one central cleanup timer instead of many concurrently running go functions and timers.
* Fixed unit tests.