Erased some legacy TODOs.