Remove bootstrap and minor updates