Lucene dependencies added + removing useless code