Remove outcommented Boost dependency
Fixed build bug