timer and counter modules pulled out
Patched refs to removed modules