Clean up the codes
Merge pull request #4119 from bsunanda/Phase2-hgx9

Phase2 hgx9