SONARPLUGINS-3621 model cleanup, SONARCS-436