Remove unnecessary check for options.messenger