Cleanup

Removing some commented out print statements and embedding some TODO
statements.