How about we just celebrate all those things on Charlie day and let the man fade away?

Let the actual origin of the holiday become a bit of trivia for generations to come, like how Columbus Day becoming a national holiday was more about Italian-American pride than the man himself

Although granted, with how little Trump wants to do with this, we're more likely to get a ballroom day instead