Delete #18 - Delete patchs intended for 2.1

Delete patch 25 and 26 from branch 2.0, those patches belong to branch
2.1