Removed all references to the ServerModel within the client programs