Got rid of the boost dependcies