LUCENE-4956: More obsolete stuff (not even used), some moves to classes where code parts are solely used