remove short_message as well