clean up orders further