Cleaned up limitedMessageOverride functionality