Got rid of duplicate message files