Revert "4096 clean"

This reverts commit 2574cdf91903e1936238f0e48dd4f030eda3b4e0.
Revert "Revert "4096 clean""

This reverts commit 2e022f67662897dc8b43c46335a38b6b854d109a.