Cleand up pins scaffold