[CLC-1715] First stab at getting some more logging features in
[CLC-1715] Remove unncessary logic
Merge pull request #1024 from yuhunglin/CLC-1715

[CLC-1715] First stab at getting some more logging features in