fix the rest of the unregister functions