Cleaned up imports
Removed warnings
Indexing now done by a bean once at application start