Remove some old TODO comments
bug fix: bad logic in capsule-vs-capsule