Base disconnect cleanup on when register is actually called