Removed mixed() and calculus dep