diff --git a/lib/request.js b/lib/request.js
index 0505c57..c4a5ccf 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -304,7 +304,6 @@ module.exports = {
    */
 
   get socket() {
-    // TODO: TLS
     return this.req.socket;
   },
 
diff --git a/lib/response.js b/lib/response.js
index d9949fa..9959747 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -33,7 +33,6 @@ module.exports = {
    */
 
   get socket() {
-    // TODO: TLS
     return this.ctx.req.socket;
   },
 
@@ -45,7 +44,6 @@ module.exports = {
    */
 
   get header() {
-    // TODO: wtf
     return this.res._headers || {};
   },
 
diff --git a/test/response/type.js b/test/response/type.js
index eaa7f52..862fa7e 100644
--- a/test/response/type.js
+++ b/test/response/type.js
@@ -55,7 +55,7 @@ describe('ctx.type', function(){
   describe('with no Content-Type', function(){
     it('should return ""', function(){
       var ctx = context();
-      // TODO: this is lame
+      // this is lame
       assert('' === ctx.type);
     })
   })