Remove recursive object references

[zfalls]

Removed the references to objects within objects to reduce memory usage and depth.
Check all functions to confirm they work properly.