Cleaned up the pins scaffolding