tidy up equals(), some unnecessary clone() methods and remove SecondaryIndex.getAllocator()