basic pep and buy cleanup