Remove obsolete property, add convenience method
First pass attempt to abstract new billing token code