Revert "Clearing everything out"

This reverts commit d8d15c5266a79c28ce11b27c40475be318f3e0b3.