Cleaned up the pins Scaffold