remove dependance on client