Refactor replace_vars: remove notice which is no longer thrown