#10591 cleaning up