fixed the shmac timer implicit shift bug, removed some dead code