Remove more references to gear.