Removed seprate call to calc