Clean up of import people code