r26270 - refactor: delete code inside if(false), delete boundaries for if(true)I

Top