Avoid index creations

/cc @SamSaffron