Comment out use of HQL builder