Cleanup of puppet script - HM properties removing