Refactor tags for undefine

    Remove undefine