cleaned up pins and scaffolding