HG-838
1) dependency clean up