diff --git a/lib/common.js b/lib/common.js
new file mode 100644
index 0000000..343d2a9
--- /dev/null
+++ b/lib/common.js
@@ -0,0 +1,6 @@
+'use strict';
+
+exports.removeSuffixFromNumber = function removeSuffixFromNumber(number, suffix) {
+    const re = new RegExp((suffix || '@.*') + '$');
+    return number.replace(re, '');
+}
diff --git a/lib/modemSelect.js b/lib/modemSelect.js
deleted file mode 100644
index 4f441ad..0000000
--- a/lib/modemSelect.js
+++ /dev/null
@@ -1,34 +0,0 @@
-"use strict";
-
-function getModemConfig(modemName, modemsConfig) {
-    if (!modemsConfig) return;
-    if (!modemName) return;
-    if (typeof modemName === 'string' && !modemName.trim()) return;
-
-    return modemsConfig[modemName.trim()];    
-}
-
-function getModemUrl(modemName, modemsConfig) {
-    const modemConfig = getModemConfig(modemName, modemsConfig);
-    return modemConfig ? modemConfig.url : null;
-}
-
-function getModemApikey(modemName, modemsConfig) {
-    const modemConfig = getModemConfig(modemName, modemsConfig);
-    return modemConfig ? modemConfig.apikey : null;
-}
-
-function removeSuffixFromNumber(number, config) {
-    if (!config) {
-        config = {};
-    }
-
-    const suffix = config && config.number_suffix ? config.number_suffix : '@.*';
-    const re = new RegExp(suffix + '$');
-    return number.replace(re, '');
-}
-
-exports.getModemConfig = getModemConfig;
-exports.getModemUrl = getModemUrl;
-exports.getModemApikey = getModemApikey;
-exports.removeSuffixFromNumber = removeSuffixFromNumber;
\ No newline at end of file
diff --git a/lib/transport.js b/lib/transport.js
index 9047ad2..0e496f0 100644
--- a/lib/transport.js
+++ b/lib/transport.js
@@ -12,7 +12,7 @@ const logger = require('komodo-sdk/logger');
 
 const messagingService = require('komodo-center-messaging-client-lib');
 
-const modemSelect = require('./modemSelect');
+const common = require('./common');
 const modems = require('./modems2');
 const partnerLastSeen = require('./partner-last-seen');
 const history = require('./history');
@@ -114,7 +114,7 @@ async function send(partner, msg) {
     msg = msg.trim();
     if (!msg) return;
 
-    const destinationNumber = modemSelect.removeSuffixFromNumber(partner, config);
+    const destinationNumber = common.removeSuffixFromNumber(partner, config.number_suffix);
     const prefixName = await prefixes.lookup(destinationNumber);
     logger.verbose('Destination number prefix lookup', {partner: destinationNumber, prefix: prefixName});