Revert "Clean Slate"

This reverts commit 93f3533ce2ff4d8ddb64025da4bbe109de1c17fd.