Merge pull request #5473 from mpg/rm-dead-code

Avoid dead code in some configurations