Remove unused functions and some other changes in vimrc