Removing some hard coded library access.