Remove a couple of things from the basic scaffold

It is a little bit cleaner now