Clean up pin scaffold