remove os.environ custom stuff and start using registry