Removing environment scripts
Configuration refactor