Updated all calculations to only use BaseEmrCalculation where necessary, and deprecated that class