Fixing remove for users
Fixing remove user v2