take out all scaffolding architecture