Remove unused plugins / commented code