diff --git a/CONTRIBUTORS b/CONTRIBUTORS
deleted file mode 100644
index cb65c25e88..0000000000
--- a/CONTRIBUTORS
+++ /dev/null
@@ -1,15 +0,0 @@
-# This is the official list of people who have contributed to the project. The
-# copyright is held by those individuals or organizations in the AUTHORS file.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-
-# Please keep the list sorted by first name.
-
-Jason Swindle <jason@swindle.me>
-Johan Euphrosine <proppy@google.com>
-Kamil Yurtsever <kyurtsever@google.com>
-Nan Deng <dengnan@google.com>
-Rohit Jnagal <jnagal@google.com>
-Victor Marmol <vmarmol@google.com>
-Zohaib Maya <zohaib@google.com>
diff --git a/info/advice.go b/info/advice.go
deleted file mode 100644
index 8084cf4741..0000000000
--- a/info/advice.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 Google Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package info
-
-// This struct describes one type of relationship between containers: One
-// container, antagonist, interferes the performance of other
-// containers, victims.
-type Interference struct {
-	// Absolute name of the antagonist container name. This field
-	// should not be empty.
-	Antagonist string `json:"antagonist"`
-
-	// The absolute path of the victims. This field should not be empty.
-	Victims []string `json:"victims"`
-
-	// The name of the detector used to detect this antagonism. This field
-	// should not be empty
-	Detector string `json:"detector"`
-
-	// Human readable description of this interference
-	Description string `json:"description,omitempty"`
-}
diff --git a/manager/container.go b/manager/container.go
index e1616feeda..e4e5b683aa 100644
--- a/manager/container.go
+++ b/manager/container.go
@@ -32,11 +32,6 @@ var HousekeepingInterval = flag.Duration("housekeeping_interval", 1*time.Second,
 var maxHousekeepingInterval = flag.Duration("max_housekeeping_interval", 60*time.Second, "Largest interval to allow between container housekeepings")
 var allowDynamicHousekeeping = flag.Bool("allow_dynamic_housekeeping", true, "Whether to allow the housekeeping interval to be dynamic")
 
-// Internal mirror of the external data structure.
-type containerStat struct {
-	Timestamp time.Time
-	Data      *info.ContainerStats
-}
 type containerInfo struct {
 	info.ContainerReference
 	Subcontainers []info.ContainerReference
diff --git a/manager/manager.go b/manager/manager.go
index 88dacffeae..26c4f3513c 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// TODO(cAdvisor): Package comment.
+// Manager of cAdvisor-monitored containers.
 package manager
 
 import (
@@ -501,11 +501,6 @@ func (m *manager) detectSubcontainers(containerName string) error {
 	return nil
 }
 
-func (self *manager) processEvent(event container.SubcontainerEvent) error {
-	// TODO(cAdvisor): Why does this method always return nil? [satnam6502]
-	return nil
-}
-
 // Watches for new containers started in the system. Runs forever unless there is a setup error.
 func (self *manager) watchForNewContainers(quit chan error) error {
 	var root *containerData