Remove Results, use Infinity + some comments (issue 6496)