ENG-21278: code cleanup. (#567)
ENG-21278: code cleanup. (#567)

* ENG-21278: code cleanup.

* Update license
VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb,VoltDB/voltdb