Cleanup from PR