Removed two TODOs.