[Task] #123, cleanup environment variables

[Task] #123, cleanup environment variables #414