Remove boost dependency