clean up duplicated condition
ignore local props
removed pointless and misleading UUID