Remove old MessageBundle implementation