Remove references to the old UserServer.
More physics cleanup.