Removed not-used code
Merge pull request #15257 from jetthoughts/remove_redundant_code

Removed not used code