General cleanup

- Cleanup some todos, comments, and unused variables