Remove some patches

Adresses #109