Renamed CUserMessage to UserMessage

Removed unused macros