Non-Garbage clean (07/20 updated, rb/bo added )