Delete old fields/tables.

Change-Id: I00727e9f116adb86f38d7a80160d067d5a3ffc2b