Fix update for control vocab
Remove old code