keys cleanup pt2