Clearned up the pins scaffold