Cleaned up bootstrap duplications