cleaned up pins and scaffold