Intermediate commit (Doesn't Build): Simplification of DbActor