Changes to syntax handling, removed some plugins