Fix issue where a race condition can occur while loading m3u8 files.  Also clean up some unnecessary imports.