remove messages
Merge branch 'hotfix-remove_messages'