Clean up new system plugins as per a10dbddd4162560da8bba667284c5209ad1f8b14