Clean handlers after moving to proper scopes.