final fix: clear deprecated fields