Remove duplicate code introduced by merge
Remove some outdated timeouts on thread collapsing

I believe this is no longer necessary since we started using
`event.preventDefault` more consistently in annotation actions.

That's good, because this timeout stuff was brittle.