Remove extraneous and overlapping Factor typedef