Removed the GenericClient file, as it's just not necessary