[#2212] CID25816:

Removed dead code
[#2212] CID25805 and CID25713:

Removed infinite loop
[#2212] CID25650:

Removed dead code