Changed object property references within masked objects to reference properties on the original object. Cleaned up unneeded functions.
Changed object property references within masked objects to reference properties on the original object.
Cleaned up unneeded functions.

njweb/cellule