Remove unnecessary server-client-related class/method