Removed few plugins and made few changes