Removed group and order by clauses