Remove more bool