Remove environment configuration and refactor comments