Cleanup per discussion.