get rid of some unnecessary scaffolding