I think you're right to have the handlers explicitly removed.