The same comment about boost vs non-boost - it will not be even compiled all the time, remove this from code