geehrc: overall cleanup