remove child class of Publisher and Client. The two are almost same