Cleanup: use env_path instead of building the path