cleanup
refactor things for >2.7
refactor things for >2.7
remove hiera