Ss testing cleanup