Remove puppet specific stuff from master