cleaned up pins scaffold