remove risky username logic