Remove unused plugins and add surround