clean up main manifest and puppetfile comments