NOREF: Cleaning up some of my mistakes inmplementing profiles, roles, hieradata, etc.