Remove some vestiges of FilmState.