Removed dependency from util::Math