Switch to new MESSAGE enum
@SuppressWarnings("deprecation")
Refactor MESSAGE name, remove unused