Cleaned up the pins scaffold...or not