Remove lots of legacy test code from remote.py and services.py.