Removed timer hacks. Timer is now the most basic implementation. I'm investigating...

Removed timer hacks. Timer is now the most basic implementation. I'm investigating...