Minimised docblocks for deprecated methods
Abstracted messages helper to class