diff --git a/src/models/actor/Actor.types.ts b/src/models/actor/Actor.types.ts
index be1edfc..36f1cc1 100644
--- a/src/models/actor/Actor.types.ts
+++ b/src/models/actor/Actor.types.ts
@@ -146,8 +146,6 @@ export interface ActorFields extends APObjectFields {
      */
     streams?: StreamsValue | StreamsValue[];
 
-    // TODO preferredUsername or preferredUsernameMap at one time
-
     /**
      * A short username which may be used to refer to the actor, with no uniqueness guarantees.
      * [For multiple language-tagged values use preferredUsernameMap property]
diff --git a/src/models/apBase/APBase.model.ts b/src/models/apBase/APBase.model.ts
index 8295871..24f8469 100644
--- a/src/models/apBase/APBase.model.ts
+++ b/src/models/apBase/APBase.model.ts
@@ -25,7 +25,7 @@ export class APBase<T extends WithContext> {
     }
 
     protected parseValue(value: any): any {
-        return value instanceof APBase ? value.toPlain() : value.toValue();
+        return value instanceof APBase ? value.toPlain() : value.valueOf();
     }
 
     public toPlain(): Record<string, any> {
diff --git a/src/models/question/Question.types.ts b/src/models/question/Question.types.ts
index e3c9e25..b05f9a8 100644
--- a/src/models/question/Question.types.ts
+++ b/src/models/question/Question.types.ts
@@ -3,7 +3,6 @@ import {AnyOfValue, ClosedValue, OneOfValue} from "../../common/types";
 
 export interface QuestionFields extends IntransitiveActivityFields {
 
-    // TODO: only oneOf or anyOf at one time
     /**
      * Identifies an exclusive option for a Question.
      * Use of oneOf implies that the Question can have only a single answer.