Remove first and last name references in the code