VP-191 Removed UniqueEntityPathFactory