diff --git a/src/main/scala/org/cloudfun/CloudFunService.scala b/src/main/scala/org/cloudfun/CloudFunService.scala
index aa4cb44..78f6c0c 100644
--- a/src/main/scala/org/cloudfun/CloudFunService.scala
+++ b/src/main/scala/org/cloudfun/CloudFunService.scala
@@ -7,6 +7,7 @@ import util.{StringUtils, OneLineLogFormatter, LogMethods}
 /**
  * Trait for central CloudFun services.
  */
+// TODO: Move to utils?
 trait CloudFunService extends LogMethods {
 
   private var running = false
diff --git a/src/main/scala/org/cloudfun/server/CloudFunServer.scala b/src/main/scala/org/cloudfun/server/CloudFunServer.scala
deleted file mode 100755
index f8c22a8..0000000
--- a/src/main/scala/org/cloudfun/server/CloudFunServer.scala
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.cloudfun.server
-
-import _root_.org.cloudfun.CloudFun
-import _root_.org.cloudfun.storage.memory.InMemoryStorage
-import java.io.File
-import org.cloudfun.data.Data
-import org.cloudfun.entity.Entity
-import org.cloudfun.util.options.OptionParser
-
-/**
- * 
- */
-// TODO: Merge with other server class
-@Deprecated
-object CloudFunServer {
-
-  def main(args: Array[String]) {
-    var dataPath: String = "./data"
-    var memory = false
-    var port: Int = 7766
-    val parser = new OptionParser("CloudFunServer") {
-      opt("d", "data", "root directory for database, defaults to " + dataPath, {v: String => dataPath = v})
-      booleanOpt("m", "memory", "keeps all data in memory, and does not save it to disk, defaults to " + memory, {v: Boolean => memory = v})
-      intOpt("p", "port", "port to listen to incoming client connections on, defaults to " + port, {v: Int => port = v})
-    }
-    if (parser.parse(args)) {
-
-      // Initialize database
-      println("== Storage setup ==")
-      val storage = if (memory) {
-        println("Running storage in memory only.  Nothing will be persisted.")
-        new InMemoryStorage()
-      }
-      else throw new UnsupportedOperationException("Not yet implemented")
-
-      //CloudFun.storage = storage
-
-      // Initialize gametime
-      println("== Gametime setup ==")
-      // Load last time from database?
-
-      // Initialize scheduler
-      println("== Scheduler setup ==")
-      // Load schedule queue from database?
-
-      // Initialize network
-      println("== Network setup ==")
-//      CloudFun.
-
-
-    }
-
-  }
-}
-