Remove TODOs already taken care of.