Revert "clean2"

This reverts commit 8959d7bd5632ed03493b73b094eb0c3a607e1fc4.