Revert "Revert "Clearing everything out""

This reverts commit 4e43c54161be40d810bc93629bae52cce65c3b5e.