Reinstating database and env_vars to ignore