cleanup scaffolded stuff