Removed some TODOs.