diff --git a/desugarer.go b/desugarer.go
index b4b8752..d9a0ad6 100644
--- a/desugarer.go
+++ b/desugarer.go
@@ -109,7 +109,6 @@ func desugarFields(location ast.LocationRange, fields *ast.ObjectFields, objLeve
 	}
 
 	// Simplify asserts
-	// TODO(dcunnin): this
 	for i := range *fields {
 		field := &(*fields)[i]
 		if field.Kind != ast.ObjectAssert {
@@ -130,7 +129,6 @@ func desugarFields(location ast.LocationRange, fields *ast.ObjectFields, objLeve
 	}
 
 	// Remove methods
-	// TODO(dcunnin): this
 	for i := range *fields {
 		field := &((*fields)[i])
 		if !field.MethodSugar {
@@ -403,7 +401,6 @@ func desugar(astPtr *ast.Node, objLevel int) (err error) {
 		if err != nil {
 			return
 		}
-		// TODO(dcunnin): Need to handle bopPercent, bopManifestUnequal, bopManifestEqual
 
 	case *ast.Conditional:
 		err = desugar(&node.Cond, objLevel)
@@ -453,7 +450,7 @@ func desugar(astPtr *ast.Node, objLevel int) (err error) {
 		}
 		if node.Id != nil {
 			if node.Index != nil {
-				panic("TODO")
+				panic(fmt.Sprintf("Node with both Id and Index: %#+v", node))
 			}
 			node.Index = makeStr(string(*node.Id))
 			node.Id = nil
@@ -585,6 +582,5 @@ func desugarFile(ast *ast.Node) error {
 	if err != nil {
 		return err
 	}
-	// TODO(dcunnin): wrap in std local
 	return nil
 }
diff --git a/interpreter.go b/interpreter.go
index 293ef31..84e750f 100644
--- a/interpreter.go
+++ b/interpreter.go
@@ -243,8 +243,6 @@ func (i *interpreter) getCurrentEnv(ast ast.Node) environment {
 }
 
 func (i *interpreter) evaluate(a ast.Node, context *TraceContext) (value, error) {
-	// TODO(dcunnin): All the other cases...
-
 	e := &evaluator{
 		trace: &TraceElement{
 			loc:     a.Loc(),