fix ambiguous variable names
remove obsolete object updates
object container cross references
object container cross references
add/update/remove method simplifications
object reference