Fixed roles removal