Remove User#first_name and User#surname for now