Cleand up the pins scaffold