more reIndex cleanup #389