RE: Cleanup for upstreaming status