cleanup from vundle merge