remove code that could never be executed (tautological truth test) Bug #800