Added task to remove a top-level org. Corrected task which adds it back.