Removed Google dependencies from Client