Cleaned up pins scaffols