Culling some TODOs