Merge pull request #14039 from rohitwaghchaure/code_clanup_hr

Code cleaup