use with not w/ in comments
Remove bogus entries in classpath.
Merge pull request #2 from paul-lshift/small-cleanups

Small cleanups