removed aux* stuff from Client