MessageFormatter: cleanup unused code