Updating patch and adding a patch to remove the C-Shell scripts