remove unused exceptions
fix sonar problems
fix sonar problems