remove patch, and more comments