refactor things for >2.7
remove hiera
fix source
fix source