Cleaned up automatic thrift usage, added a clean.