cleanup id strategy logic and validation step. fix PHPCR-60