Revert "Revert "Classpath removed""

This reverts commit b9760a92e1ab875d51b32c2f0bd5e580d3d9749f.