partial cleanup of movie-mode