update/simplify order-dependencies