diff --git a/samples/pg-schema-information.js b/samples/pg-schema-information.js
index 99dbd8235..954b5153f 100644
--- a/samples/pg-schema-information.js
+++ b/samples/pg-schema-information.js
@@ -49,7 +49,7 @@ function main(
     // are only available for PostgreSQL databases.
     const query = {
       sql:
-        'SELECT table_catalog, table_schema, table_name, ' +
+        'SELECT table_schema, table_name, ' +
         'user_defined_type_catalog, ' +
         'user_defined_type_schema, ' +
         'user_defined_type_name ' +
@@ -62,7 +62,7 @@ function main(
       rows.forEach(row => {
         const json = row.toJSON();
         console.log(
-          `Table: ${json.table_catalog}.${json.table_schema}.${json.table_name} ` +
+          `Table: ${json.table_schema}.${json.table_name} ` +
             `(User defined type: ${json.user_defined_type_catalog}.${json.user_defined_type_schema}.${json.user_defined_type_name})`
         );
       });
diff --git a/samples/system-test/spanner.test.js b/samples/system-test/spanner.test.js
index 1cca65c23..540651e0f 100644
--- a/samples/system-test/spanner.test.js
+++ b/samples/system-test/spanner.test.js
@@ -1420,19 +1420,10 @@ describe('Spanner', () => {
       const output = execSync(
         `node pg-schema-information.js ${SAMPLE_INSTANCE_ID} ${PG_DATABASE_ID} ${PROJECT_ID}`
       );
-      assert.match(
-        output,
-        new RegExp(`Table: ${PG_DATABASE_ID}.public.albums`)
-      );
-      assert.match(
-        output,
-        new RegExp(`Table: ${PG_DATABASE_ID}.public.author`)
-      );
-      assert.match(output, new RegExp(`Table: ${PG_DATABASE_ID}.public.book`));
-      assert.match(
-        output,
-        new RegExp(`Table: ${PG_DATABASE_ID}.public.singers`)
-      );
+      assert.match(output, new RegExp('Table: public.albums'));
+      assert.match(output, new RegExp('Table: public.author'));
+      assert.match(output, new RegExp('Table: public.book'));
+      assert.match(output, new RegExp('Table: public.singers'));
     });
 
     // pg_ordering_nulls
diff --git a/src/codec.ts b/src/codec.ts
index 034c89e10..58c1a56ae 100644
--- a/src/codec.ts
+++ b/src/codec.ts
@@ -18,10 +18,9 @@ import {PreciseDate} from '@google-cloud/precise-date';
 import arrify = require('arrify');
 import {Big} from 'big.js';
 import * as is from 'is';
-import {common as p, util} from 'protobufjs';
+import {common as p} from 'protobufjs';
 import {google as spannerClient} from '../protos/protos';
 import {GoogleError} from 'google-gax';
-import float = util.float;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Value = any;