Some cleanup.
Start looking into the MediaBrowser port.