Task reorg 1 cleanup

Oh true