rm redundant boolean equality tests