refactor things for >2.7
remove hiera stuff