BUG stop referring to oomatrix.task; remove some dead code