big cleanup/reorg in progress