Merge "Remove prepare_env"