more index cleanup