remove attributes motivated by chef_client and instead do the right thing if chef_client is present