More cleanup/reorg