Removed current object referencing where unnecessary.