reorg, remove unused stuff