(Rice) Get rid of some unused bools