Cleanup for pull-request.