Merge "Remove TODO which was already completed."