Task reorg 1 cleanup

D'oh!