Cleanup 'RemoteControl' code