misc cleanup
misc cleanup / reorg