Deleted unused classes, Server done