Clean up ConfBridge commands to account for wait_marked users