Deprecated calls replaced + removal of old licence key refs.

Jamie,
I've fixed the deprecated calls as per our recent emails.
This pull will also bring in the old fix of the license key references that I fixed last year.
Hope the exams are going well.
Cheers,
Alex