order history cleanup, update icml generator