Removed .hql references