Revert "Clearing everything out"

This reverts commit 4ee5b9752086b22714f4f9c3cd0b16f7bb91117c.