Removed unused code
Removed old plugin system