cleaned up pin scaffold