Removing undefined from upgraded messages