Remove redundancies from Client