Replaced the removal of callbacks.