Revert "Last of initial commits"

This reverts commit 63d422dab28285c90dcdb4ece0e7b19576d2a79e.