Subtitles: Remove long-unneeded methods.  Improve performance.
Merge remote-tracking branch 'upstream/master'