Some more cleanup in MediaPlayer