Forgot to remove last vestiges of now unused linear and cubic code