LUCENE-5752: minor cleanups / remove imports / sops, etc.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5752@1603116 13f79535-47bb-0310-9956-ffa450edef68