19595

quick fixes to weed out inactive internals