2014-12-04; rrink; CHG: cleanup - WIP