Removed two unneeded/handled TODO comments.