Boost unnecessary stuff removed