Address issues #6 & #7

* Some lint fixes to remove extra definitions and like.
* Removed old TODOs, ones still present are legit.