cleaned out unused stuff ported from order