cleanup scaffolded code