PassportLead-X: Removing cruft