Remove dependence on linear.