Removed MathUtils dependency