sonar cleanup
more sonar updates
more cleanups