More scaffold cleanup.