Puppet cleanup

This pull removes heavy puppet dependencies in favor of easier to read base
operations from puppet.