Simplifying subscription taxes

Simplifying subscription taxes