EI3 market process clean up, first version