Some Cleanups. [DWOSS-71]
Some Cleanups. [DWOSS-71]