Video (vid-243): move getUnswappedVideoList() to helper class