Remove cost references until it works