Moved unused classified math to util class if needed