diff --git a/bundles.d/lang.c-cxx.vim b/bundles.d/lang.c-cxx.vim
index 084b3f7..5cf859f 100644
--- a/bundles.d/lang.c-cxx.vim
+++ b/bundles.d/lang.c-cxx.vim
@@ -1,4 +1,6 @@
-NeoBundleLazy 'Rip-Rip/clang_complete', {
+"NeoBundleLazy 'Rip-Rip/clang_complete', {
+NeoBundleLazy 'DarkDefender/clang_complete', {
+      \ 'rev': 'deo_clang_py3',
       \ 'autoload': {
       \  'filetypes':['c', 'cpp'],
       \  'external_commands' : ['clang'],
@@ -16,6 +18,12 @@ NeoBundleLazy 'jeaye/color_coded', {
       \ 'disabled' : has('nvim')
       \}
 
+NeoBundle 'critiqjo/lldb.nvim', {
+      \ 'autoload': {
+      \  'filetypes':['c', 'cpp'],
+      \ }
+      \ }
+
 NeoBundleLazy 'rhysd/vim-clang-format',
       \ { 'autoload' : { 'filetypes' : ['c', 'cpp', 'objc', 'objcpp'] } }
 
diff --git a/settings/clang_complete.vim b/settings/clang_complete.vim
index 59f23e1..33d3f61 100644
--- a/settings/clang_complete.vim
+++ b/settings/clang_complete.vim
@@ -1,9 +1,5 @@
 if neobundle#tap('clang_complete')
   function! neobundle#hooks.on_source(bundle)
-    let s:clang_library_path='/Library/Developer/CommandLineTools/usr/lib'
-    if isdirectory(s:clang_library_path)
-      let g:clang_library_path=s:clang_library_path
-    endif
   endfunction
 
   call neobundle#untap()
diff --git a/settings/syntastic.vim b/settings/syntastic.vim
index d4f78b9..3f8f9b7 100644
--- a/settings/syntastic.vim
+++ b/settings/syntastic.vim
@@ -10,7 +10,6 @@ if neobundle#tap('syntastic')
     " http://stackoverflow.com/a/23105873
     let g:syntastic_html_checkers=['']
     let g:syntastic_rst_checkers=['']
-    let g:syntastic_c_checkers=['']
     let g:syntastic_ruby_checkers = ['mri', 'rubylint']
 
     if executable('rubocop')
@@ -20,7 +19,7 @@ if neobundle#tap('syntastic')
     " Disable syntastic for python (managed by python-mode)
     let g:syntastic_mode_map = {
         \ 'mode': 'active',
-        \ 'active_filetypes': ['ruby'],
+        \ 'active_filetypes': ['ruby', 'c'],
         \ 'passive_filetypes': ['python', 'go', 'viml'] }
 
     " Try to improve crippling performance