Removed TODOs that were either irrelevant or already fixed.