[#139] Remove ODA calculations