[SONARFIXES] Fixed some major sonar issues
Merge branch 'develop' of ssh://haisulike01.nls.fi/Oskari into develop
[AH-1242] Unbind remove button as well