Fix unregistering for full shuttle