more cleaning up; shit ain't working