some cleaning in the video plugin