cleanup, subtitlesFactory update