Initial pass at removing two ORDER BY FIELD statements