Add dummy timer interrupt, more code cleanup.