Fix unregisterCommand(s) - second try