Revert "Major changes to Order and OrderList"

This reverts commit b3ff38c66386c48ae1294c19670b20b829c838a7.