remove code depending on default scaffolding stuff