adding some TODO notes after code review. Deleted some old code that is no longer needed.