cleaning up some of the bootstrap scaffolding