removed keys and tokens