Removing some deprecated columns.
am: cc8f9e0af7

* commit 'cc8f9e0af7f9acc6f03a1a0173d3e118b4e96ae5':
  Removing some deprecated columns.

Change-Id: I766358316fa9a0c135a23565be2d4dd4fc713894