Cleaned up the pins scaffold again