Revert "some unused fields deleted"

This reverts commit 31db58f7204ac8bb434599ff51d794640718845c.