removed 'owner' from computed attribute
removed unused code