SONARPLUGINS-3834 fix and code clean up
Clean up