Update comparison tool and remove patches since they are upstream.