Remove Bolts.h header?