Clean up of pin scaffolding