Clean up 3rd party drm code