Put a line on logs when this situation happens!
Remove a line spotted by @fitchner which is not needed at all
Remove commented out code since long time