cleanup @lwangenheim's scaffolding :P