Removed unused code and changed syntax->plugin