Further cleanup of what's being tracked.
More files removed, cleaned up todo list.