removed unused scaffolding stuff