NXP-15409 cleanup guice classpath