FMS-272 - Fix condition showing notification related to potential duplicates
Lint
Remove commented code