Remove max label

Fixes issues #247.
This pull request replaces pull request #251