Cleanup after pull, and adjust to v1 API.