Task reorg 1 cleanup

Infinite loop?