Remove unused media vars, fix double adds