Fix: deleting removed data fields