cluen up unused imports, better timer callback clearing.