Fixed Lucene deprecation warnings
Cleanup