Actually invoke disconnected callback

- cleanup dead code comment
- only clear timer if timer is defined