removing list-comps from the TODO