Removed old TODO file, various code cleanups