Check and drop some TODOs