cleanup

don't keep stale timer refs etc
no functional changes yet