Get rid of a lot of now-obsolete timer code