diff --git a/vimrc b/vimrc
index 79e7e37..ad633d1 100644
--- a/vimrc
+++ b/vimrc
@@ -19,8 +19,6 @@ Bundle 'Shougo/neosnippet-snippets'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
-Plugin 'scrooloose/syntastic'
-"Plugin 'terryma/vim-multiple-cursors'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
@@ -35,6 +33,7 @@ Plugin 'majutsushi/tagbar'
 Plugin 'wellle/targets.vim'
 Plugin 'Chiel92/vim-autoformat'
 Plugin 'Valloric/YouCompleteMe'
+Plugin 'Raimondi/delimitMate'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -47,37 +46,12 @@ let g:ctrlp_custom_ignore = {
     \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
     \ }
 
-""" SYNTASTIC """
-
-set statusline+=%#warningmsg#
-set statusline+=%{syntasticstatuslineflag()}
-set statusline+=%*
-
-let g:syntastic_always_populate_loc_list = 0
-let g:syntastic_auto_loc_list = 0
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 0
-
-""" VIM-MULTIPLE-CURSORS """
-
-let g:multi_cursor_use_default_mapping=0
-" Default mapping
-let g:multi_cursor_next_key='<C-n>'
-let g:multi_cursor_prev_key='<C-p>'
-let g:multi_cursor_skip_key='<C-x>'
-
-let g:multi_cursor_quit_key='<Esc>'
-" Map start key separately from next key
-let g:multi_cursor_start_key='<F6>'
-let g:multi_cursor_start_key='<C-n>'
-let g:multi_cursor_start_word_key='g<C-n>'
-
 """ VIM-AIRLINE """
 
 set noshowmode
 set laststatus=2
 let g:airline_powerline_fonts = 1
-let g:airline#extensions#syntastic#enabled = 1
+" let g:airline#extensions#syntastic#enabled = 1
 let g:airline#extensions#tabline#enabled = 1
 
 let g:airline_section_a = airline#section#create(['mode'])
@@ -98,6 +72,10 @@ let g:NERDTreeIndicatorMapCustom = {
     \ "Unknown"   : "?"
     \ }
 
+""" YOUCOMPLETEME """
+
+let g:ycm_global_ycm_extra_conf = '~/.config/ycm_extra_conf.py'
+
 
 """ VIM SETTINGS """
 
@@ -129,6 +107,8 @@ set backspace=indent,eol,start
 set hidden
 set updatetime=250
 
+set cursorcolumn
+
 syntax enable
 
 set background=dark
@@ -158,15 +138,6 @@ if has('persistent_undo')
     set undofile
 endif
 
-map <up> <nop>
-map <down> <nop>
-map <left> <nop>
-map <right> <nop>
-imap <up> <nop>
-imap <down> <nop>
-imap <left> <nop>
-imap <right> <nop>
-map ;; <Esc>
-imap ;; <Esc>
+imap jk <Esc>
 map <Enter> o<Esc>