Cleanup

Remove uneeded import
Remove unneeded classpath entry.