cleanup pt. 1