Cleanup scaffolding default layout