cleanup pt2