Cleanups

- Removed @todo that are already done.
- Remove function call to local variable.