Calculator: Remove unused string

Also readd cm_extra to get rid of compiler warnings.
Why was this even removed...?

Change-Id: Ied76a576b6c0aae64115084973a2346031388f2d
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Merge remote-tracking branch 'm/kk44' into HEAD