Remove unnecessary code from scaffolding