You've deleted a function that as far as I know is still used (in hqlutil.cpp).  I don't think this branch would actually compile/link.