Remove o.e.common.UUID and replace it with a simplified version