diff --git a/lib/session.js b/lib/session.js
index 387edef..74071c7 100644
--- a/lib/session.js
+++ b/lib/session.js
@@ -288,11 +288,6 @@ function session(sock) {
 				smsData = {};
 			}
 
-			if (smsData.smsId !== undefined) {
-				// Todo: Generate random ID
-				smsData.smsId = '666';
-			}
-
 			smsObj.smsId = smsData.smsId;
 
 			returnObj.sendReturn(pduObj, 'ESME_ROK', {'message_id': smsObj.smsId});