fix broken message keys. remove deprecated folder.