Clean up
Update Mentor fields