Revert "scaffolding + bootstrap"

This reverts commit 2f024284bd090dace77edf075c0612af81548ead.