Update to remove HAVE_ and library checks