Fixed #762 Orders and Invoices Queries not currently in use should be removed before release