Clean up code

Remove commented '// TODO' code blocks
More code clean ups

Remove more commented '// TODO' code blocks