Cleanup of viaplay service #8
Cleanup of HBO service. Closes #8