reorg and tossing out cruft