[cleanup] NOSONAR comments removed for if statements since they are not

needed anymore