remove AutoComplPop and surround
add AutoComplPop and surround