Remove useless if/else around bool logic