Merge removal of unneeded library calls This is useful so that the package checks successfully in amdahl and moore. Checked by myself (minor modifications).
