diff --git a/vimrc b/vimrc
index b6d0e5f..6043222 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,4 @@
 se nocompatible
-filetype off
 
 call plug#begin('~/.vim/plugged')
 
@@ -115,33 +114,34 @@ set noml mls=5				" scan 5 lines for modelines
 syn on						" enable syntax highlighting
 set hls						" highlight search
 set bg=dark					" dark background
+se foldlevel=99
+set vb                          " turn on the "visual bell" - which is much quieter than the "audio blink"
+set nobackup
+se bs=2
 
 set mouse=
+set title
 
 colors jellybeans
 
-au BufNewFile,BufRead *.vala  setf cs
-au BufNewFile,BufRead *.md  set ft=markdown
 au syntax java  set ts=4 sts=4 sw=4
-au BufNewFile,BufRead *.i set ft=swig
+
 au BufNewFile,BufRead *.s set ft=tptp
 au BufNewFile,BufRead *.s.out set ft=tptp
 au BufNewFile,BufRead *.tptp set ft=tptp
+
 au BufReadCmd *.epub call zip#Browse(expand("<amatch>"))
+
 au syntax haskell setl omnifunc=necoghc#omnifunc
 let g:necoghc_enable_detailed_browse=1
 let g:haskell_conceal              = 0
 
-au syntax tex setl iskeyword+=:
-let g:syntastic_tex_checkers=['lacheck']
-let g:syntastic_scala_checkers=[]
-call tcomment#DefineType('nix', '# %s')
-
 let g:LatexBox_latexmk_async = 1
 let g:LatexBox_latexmk_preview_continuously = 1
 let g:LatexBox_quickfix = 2
-
-au BufRead,BufNewFile *.tex syn region texZone start="\\begin{clilisting}" end="\\end{clilisting}\|%stopzone\>"
+call tcomment#DefineType('nix', '# %s')
+au syntax tex setl iskeyword+=:
+au syntax tex syn region texZone start="\\begin{clilisting}" end="\\end{clilisting}\|%stopzone\>"
 
 " better paragraph object for tex files FIXME
 call textobj#user#plugin('latexparagraph', {
@@ -155,32 +155,9 @@ call textobj#user#plugin('latexparagraph', {
 " disable annoying "file is read-only" warnings
 au FileChangedRO * set noreadonly
 
-se foldlevel=99
-
-set vb                          " turn on the "visual bell" - which is much quieter than the "audio blink"
-set nobackup
-se bs=2
-
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#omni#input_patterns = {}
 let g:deoplete#omni#input_patterns.scala = '[^. *\t]\.\w*'
 let g:deoplete#omni#input_patterns.ledger = '[^. *\t]\:\w*'
 
-let g:ycm_filetype_blacklist = { 'sql': 1 }
-let g:ycm_semantic_triggers = {'haskell' : ['.']}
-let g:ycm_show_diagnostics_ui = 1
-let g:EclimCompletionMethod = 'omnifunc'
-
 nnoremap <c-p> :FZF<cr>
-
-" WIP
-function LedgerGeneratePostings()
-  '<,'>!ledger -f - print --generated
-  '<,'>s/\s\s\s+/  /g
-endfunction
-
-if &term == "screen" || &term == "screen-256color-bce"
-  set t_ts=k
-  set t_fs=\
-endif
-set title