Remove some unnecesary uses of bool