Remove useless plugins
Fix some more queries