Turned off code that referenced the old object struct