remove role check first