[#83211730] Addressing PR comments.

[#83211730] Addressing PR comment for un-used use statement.

[#83211730] Removing outdated comment.