index cleanup from modules