Cleaned up the pins scaffolds