Removed unused code and comments.
Tweaked the scale factor a little when measuring the height of text strings.