general clean part 2
general clean part 2b