Add REMOTE to config, remove hardcored gateway