Cleanup
Add logging env