Cleaned up from unused plugins