Should we also be removing `user_api.msg_options` in this PR?