diff --git a/vim/.vimrc b/vim/.vimrc
index 30072de..20b6111 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -11,24 +11,10 @@ syntax on
 " switch buffers without writing to file
 set hidden
 
-" remove trailing spaces on save
-autocmd BufWritePre * :%s/\s\+$//e
-
-" make vim save and load the folding of the document each time it loads
-" also places the cursor in the last place that it was left
-" python specific settings
-au BufWinLeave *.py mkview
-au BufWinEnter *.py silent loadview
-
 " file specific formatting
 autocmd Filetype python,bash,sh setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
 autocmd Filetype css,html,htmldjango,javascript setlocal tabstop=2 softtabstop=2 shiftwidth=2
 
-" fold methods based on indents
-" zo to open folds, zc to close
-set foldmethod=indent
-set foldlevel=20
-
 " search down into subfolders
 " provides tab-completion for all file-related tasks
 set path+=**