Remove order dependency