Remove hard coding of server address