Added analystics and removed env var hack