removed order-item cont., created relationships in original/join models