Cleaned up the pins scaffold v2