Removed all references to old client