Cleanup to use local puppet config