Removed redundant client implementation