Added Puppet types -- cleanup