Remove legacy classes in server code