Refactor Objective Function dependencies