Changed LongLongIndex hierarchy and cleaned up dependencies to avoid
Maven failures