Made delete_subscription better.
Merged
Finally, irrevocably finished delete_subscription