Clean up based on PR comments