NEMO-1838: Remove TODO UPGRADE