diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 5d0ab1ce7..3cd80daf8 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -302,17 +302,6 @@ function registerListeners() {
             "dialog.internalError");
     });
 
-    APP.xmpp.addListener(XMPPEvents.SET_LOCAL_DESCRIPTION_ERROR, function () {
-        messageHandler.showError("dialog.error",
-            "dialog.SLDFailure");
-    });
-    APP.xmpp.addListener(XMPPEvents.SET_REMOTE_DESCRIPTION_ERROR, function () {
-        messageHandler.showError("dialog.error",
-            "dialog.SRDFailure");
-    });
-    APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function () {
-        messageHandler.showError();
-    });
     APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function (callback) {
         // FIXME: re-use LoginDialog which supports retries
         if (config.token) {
@@ -899,4 +888,3 @@ UI.userAvatarChanged = function (resourceJid, thumbUrl, contactListUrl) {
 UI.setVideoMute = setVideoMute;
 
 module.exports = UI;
-
diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js
index a76448120..b5beaeefd 100644
--- a/modules/xmpp/JingleSessionPC.js
+++ b/modules/xmpp/JingleSessionPC.js
@@ -1468,41 +1468,6 @@ JingleSessionPC.prototype.setLocalDescription = function () {
     }
 };
 
-// an attempt to work around https://github.com/jitsi/jitmeet/issues/32
-// TODO: is this hack (along with the XMPPEvent-s used only for it) still needed
-// now that we announce an SSRC for receive-only streams?
-function sendKeyframe(pc) {
-    console.log('sendkeyframe', pc.iceConnectionState);
-    if (pc.iceConnectionState !== 'connected') return; // safe...
-    pc.setRemoteDescription(
-        pc.remoteDescription,
-        function () {
-            pc.createAnswer(
-                function (modifiedAnswer) {
-                    pc.setLocalDescription(
-                        modifiedAnswer,
-                        function () {
-                            // noop
-                        },
-                        function (error) {
-                            console.log('triggerKeyframe setLocalDescription failed', error);
-                            eventEmitter.emit(XMPPEvents.SET_LOCAL_DESCRIPTION_ERROR);
-                        }
-                    );
-                },
-                function (error) {
-                    console.log('triggerKeyframe createAnswer failed', error);
-                    eventEmitter.emit(XMPPEvents.CREATE_ANSWER_ERROR);
-                }
-            );
-        },
-        function (error) {
-            console.log('triggerKeyframe setRemoteDescription failed', error);
-            eventEmitter.emit(XMPPEvents.SET_REMOTE_DESCRIPTION_ERROR);
-        }
-    );
-}
-
 /**
  * Handles 'onaddstream' events from the RTCPeerConnection.
  * @param event the 'onaddstream' event.
diff --git a/service/xmpp/XMPPEvents.js b/service/xmpp/XMPPEvents.js
index 6139a3dde..718fb3581 100644
--- a/service/xmpp/XMPPEvents.js
+++ b/service/xmpp/XMPPEvents.js
@@ -83,12 +83,6 @@ var XMPPEvents = {
     RESERVATION_ERROR: "xmpp.room_reservation_error",
     DISPOSE_CONFERENCE: "xmpp.dispose_conference",
     GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown",
-    // TODO: only used in a hack, should probably be removed.
-    SET_LOCAL_DESCRIPTION_ERROR: 'xmpp.set_local_description_error',
-    // TODO: only used in a hack, should probably be removed.
-    SET_REMOTE_DESCRIPTION_ERROR: 'xmpp.set_remote_description_error',
-    // TODO: only used in a hack, should probably be removed.
-    CREATE_ANSWER_ERROR: 'xmpp.create_answer_error',
     JINGLE_FATAL_ERROR: 'xmpp.jingle_fatal_error',
     PROMPT_FOR_LOGIN: 'xmpp.prompt_for_login',
     FOCUS_DISCONNECTED: 'xmpp.focus_disconnected',
@@ -97,4 +91,4 @@ var XMPPEvents = {
     // xmpp is connected and obtained user media
     READY_TO_JOIN: 'xmpp.ready_to_join'
 };
-module.exports = XMPPEvents;
\ No newline at end of file
+module.exports = XMPPEvents;