Minor clean in the index manager