remove unneeded server class