Some fixes. Mouse only cancels remove when it's called by timer.