Remove older calculations and unnecessary code