clean up blockers from sonar
fix more sonar critical and blocker issues