Removing some more leftovers
One more WITH_ variable gone
Fixing up plugin loading