3 files changed, 3 insertions, 24 deletions
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index c80daabb..29bb9238 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim filetype plugin
 " Language:             Scala
@@ -183,5 +178,3 @@ noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
 noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index 9df57081..e18ced84 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scala.xpt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 
 XPTemplate priority=lang
@@ -36,5 +31,3 @@ trait `derived^`trait^Component extends `trait^Component {
 		`body2^
 	}
 }
-
-endif
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index 8236d737..c290af07 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scala/tagbar.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
@@ -38,5 +33,3 @@ let g:tagbar_type_scala = {
 if get(g:, 'scala_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
 endif
-
-endif