remove vim, merge from paul