Remove extraneous library calls