Remove unused stuff.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
REF #4023: Implement custom message creation.