Remove dotenv
Merge branch 'remove_dotenv'