Scaffold cleanup