Remove unnecessary file from master cherry-pick