Revert "First big push"

This reverts commit 806b149b327909d0f5a78752dd781f3348a4ae28.