Update to latest and greatest and remove patches