Commenting, and purging some more unused scaffolding boilerplate