Cleaned up the pins scaffold and bootstrapping