removed the server class...