Merge "Classpath cleanup"