* revert changes * code clean up Co-authored-by: Apeksha Bhosale <7846888+ApekshaBhosale@users.noreply.github.com>