Update TODO; clean out some dead code