More stripping down of Client