#4633 #4638 performance
removed debug values