remove role selection and code enhancement