SONARPLUGINS-2628 Remove duplication