Cleanup
- fix env variable for live