Removed unused calcs