Clean up pin Scaffold