PictureInPicture: cleanup some code