Remove Client dependancy