Removed finalcalculation method