Cleanup fields as they might be deprecated/removed/change in the future (#553)

* Clean thrift files

Signed-off-by: Vikrant Puppala <[email protected]>

Author: vikrantpuppala