Clean up

Finish #36. Killing all the scaffolds