TODO

- Removed decoration TODO items.