Removing more calc usages