Refactored to remove unnecessary setup
Merge pull request #10004 from choudhuryanupam/master

Refactored to remove unnecessary setup