#1294 - added updates to remove bootstrap base on setting