NXP-15409 cleanup mockito classpath
NXP-16052: clean up "throws Exception", "catch Exception" and "catch Throwable"