Remove boost code