Remove more references to Scaffold as it is dead for now.