Refactor: Removed errorKeys implementation
Change-Id: I470ec93d145a444334b0ec3eb29895a560f9189f