* Add code from previous PR * Remove env variables from wrong place * Fix tests * Remove dead code * Package.json updates * Fix eslint error * Fix issue due to conflict resolution Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: zomars <zomars@me.com>