Removed dependencies from thrift. Removed system-specific constants.

Thrift dependencies removed. Tested in dev environment.