Merge "Remove TODO note"