JANITORIAL: rm dead/commented code