Deleted some unneeded scaffolding cruft