Cleaned up other references to subtitle models or old way of doing subtitles in codebase.