deleted unused plugins
fixing conflicts