#786 Removed unnecessary linking with plugins