Remove dependency on flow-math