Remove unused field before other upcoming changes.