Cleanup and minor fixes.

SDUX-52
Cleanup

SDUX-52