Cleaned up bootstrap.