Get rid of remaining gear references.