Remove references to old server

- In preparation of new server integration