Removed vimencrypt and cleaned up some more