diff --git a/src/project.coffee b/src/project.coffee
index 27f3c0880..eae064fd6 100644
--- a/src/project.coffee
+++ b/src/project.coffee
@@ -4,11 +4,10 @@ url = require 'url'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 Q = require 'q'
-telepath = require 'telepath'
+{Model} = require 'telepath'
 
 TextBuffer = require './text-buffer'
 Editor = require './editor'
-{Emitter} = require 'emissary'
 Directory = require './directory'
 Task = require './task'
 Git = require './git'
@@ -18,8 +17,7 @@ Git = require './git'
 # Ultimately, a project is a git directory that's been opened. It's a collection
 # of directories and files that you can operate on.
 module.exports =
-class Project extends telepath.Model
-  Emitter.includeInto(this)
+class Project extends Model
 
   @properties
     buffers: []
diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee
index d84ee24da..665b7d02d 100644
--- a/src/text-buffer.coffee
+++ b/src/text-buffer.coffee
@@ -1,5 +1,4 @@
 _ = require 'underscore-plus'
-{Emitter, Subscriber} = require 'emissary'
 Q = require 'q'
 {P} = require 'scandal'
 telepath = require 'telepath'
@@ -14,9 +13,6 @@ File = require './file'
 # the case, as a `TextBuffer` could be an unsaved chunk of text.
 module.exports =
 class TextBuffer extends telepath.Model
-  Emitter.includeInto(this)
-  Subscriber.includeInto(this)
-
   @properties
     text: -> new telepath.String('', replicated: false)
     filePath: null