Unused imports.
Deprecated holder fix.
Classpath change.