diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index 166e155..385fcb6 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -181,13 +181,12 @@ function! airline#extensions#load()
     call airline#extensions#virtualenv#init(s:ext)
   endif
 
-  if (get(g:, 'airline#extensions#eclim#enabled', 1) && get(g:, 'airline_enable_eclim', 1))
-        \ && exists(':ProjectCreate')
+  if (get(g:, 'airline#extensions#eclim#enabled', 1) && exists(':ProjectCreate'))
     call airline#extensions#eclim#init(s:ext)
   endif
 
   if (get(g:, 'airline#extensions#syntastic#enabled', 1) && get(g:, 'airline_enable_syntastic', 1))
-        \ && exists(':SyntasticCheck') && !exists('g:eclim_instead_syntastic')
+        \ && exists(':SyntasticCheck')
     call airline#extensions#syntastic#init(s:ext)
   endif
 
diff --git a/autoload/airline/extensions/eclim.vim b/autoload/airline/extensions/eclim.vim
index e3ebe31..c0b5dbe 100644
--- a/autoload/airline/extensions/eclim.vim
+++ b/autoload/airline/extensions/eclim.vim
@@ -1,12 +1,6 @@
 " MIT License. Copyright (c) 2013 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
-"if !exists('g:eclim_instead_syntastic')
-"let g:eclim_instead_syntastic = 0
-"endif
 
-"if g:eclim_instead_syntastic == 1
-"finish
-"endif
 if !exists(':ProjectCreate')
   finish
 endif
@@ -16,15 +10,14 @@ function! airline#extensions#eclim#get_warnings()
   if !empty(eclimList)
     let errorsLine = eclimList[0]['line']
     let errorsNumber = len(eclimList)
-    let errors = "[Warring: line:".string(errorsLine)." (".string(errorsNumber).")]"
-    return errors.(g:airline_symbols.space)
+    let errors = "[Eclim: line:".string(errorsLine)." (".string(errorsNumber).")]"
+    if SyntasticStatuslineFlag() == ''
+      return errors.(g:airline_symbols.space)
+    endif
   endif
   return ''
 endfunction
 
 function! airline#extensions#eclim#init(ext)
-  if !exists('g:eclim_instead_syntastic')
-    let g:eclim_instead_syntastic = 1
-  endif
   call airline#parts#define_function('eclim', 'airline#extensions#eclim#get_warnings')
 endfunction