Mass cleaning fix class group index update