Remove linkage with extraneous libs