Removed all usages of ObjectHelper.objectEquals