Error fixes, clean up.

Removed unnecessary variables and fixed animator error with object
instance name.