[REM] Remove the old method of calculation