Removed unused plugins and updated filetype handling
Removed unused plugins and updated filetype handling
merge