Remove unnesacary links causing problems
More Makefile Fixes