minor refactor; stark fist of removal pt 1