diff --git a/skins/base/views/molecules/voip/CallView.js b/skins/base/views/molecules/voip/CallView.js
index cbdcc4c24..3642e6b58 100644
--- a/skins/base/views/molecules/voip/CallView.js
+++ b/skins/base/views/molecules/voip/CallView.js
@@ -37,22 +37,5 @@ module.exports = React.createClass({
         return (
             <VideoView ref="video"/>
         );
-        /*
-        if (this.state && this.state.call) {
-            if (this.state.call.type === "video") {
-                return (
-                    <VideoView ref="video"/>
-                );
-            }
-            else if (this.state.call.type === "voice") {
-                // <WaveformView /> in the future.
-                return (
-                    <div></div>
-                );
-            }
-        }
-        return (
-            <div></div>
-        ); */
     }
 });
\ No newline at end of file
diff --git a/src/controllers/molecules/RoomHeader.js b/src/controllers/molecules/RoomHeader.js
index 766f9b40d..24f0d47ab 100644
--- a/src/controllers/molecules/RoomHeader.js
+++ b/src/controllers/molecules/RoomHeader.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 /*
  * State vars:
- * this.state.callState = OUTBOUND|INBOUND|IN_CALL|NO_CALL
+ * this.state.call_state = the UI state of the call (see CallHandler)
  */
 
 var dis = require("../../dispatcher");
diff --git a/src/controllers/molecules/voip/VideoView.js b/src/controllers/molecules/voip/VideoView.js
index b08f6ab1e..8aa688b21 100644
--- a/src/controllers/molecules/voip/VideoView.js
+++ b/src/controllers/molecules/voip/VideoView.js
@@ -16,8 +16,6 @@ limitations under the License.
 
 'use strict';
 
-var dis = require("../../../dispatcher");
-
 module.exports = {
 };