Few Small Commits

Just a few random patches.

* Removed unneeded state.

* Addressed 2 TODOs.