lucene 4.7 clean up