Remove vim config enhancement, fold in favorites