Move away from scaffolding