Remove some TODO items.
Add chain unit.