some refactoring and remove unused file
add afk and role