Killing more fname/lname cruft