More chromecast cleanup.
Merge.