Update to 2.4.5. Download from github.  This fixes java issue, so remove patches.