remove extra checks and set display_name