Removed old dunzo TODOs