Remove public_users bits to match code in production