clean up a bit of the scaffolding mess