massive update & remove bootstrap