cleanup pt 1