Fix: 799 (delete unused fields)