diff --git a/app.js b/app.js
index 1f63e6ce7f..26a4a56f15 100644
--- a/app.js
+++ b/app.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/controls.js b/controls.js
index eb192764e9..a2d367b4a6 100644
--- a/controls.js
+++ b/controls.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/externs/fullscreen.js b/externs/fullscreen.js
index 18a9b429d4..66f53d2466 100644
--- a/externs/fullscreen.js
+++ b/externs/fullscreen.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/externs/htmltrackelement.js b/externs/htmltrackelement.js
index ee5bbea00c..5c73c24d84 100644
--- a/externs/htmltrackelement.js
+++ b/externs/htmltrackelement.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/externs/jwk_set.js b/externs/jwk_set.js
index 3587ced1ae..0d602d065e 100644
--- a/externs/jwk_set.js
+++ b/externs/jwk_set.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/externs/mediakeys.js b/externs/mediakeys.js
index 793c0b6ea3..5424a4ecde 100644
--- a/externs/mediakeys.js
+++ b/externs/mediakeys.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/externs/prefixed_eme.js b/externs/prefixed_eme.js
index 6ee1fca320..261631e0c3 100644
--- a/externs/prefixed_eme.js
+++ b/externs/prefixed_eme.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/externs/xmlhttprequest.js b/externs/xmlhttprequest.js
index f463dc6d83..c60b8f4709 100644
--- a/externs/xmlhttprequest.js
+++ b/externs/xmlhttprequest.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/container_segment_index_source.js b/lib/dash/container_segment_index_source.js
index b39878b4d6..f785baa522 100644
--- a/lib/dash/container_segment_index_source.js
+++ b/lib/dash/container_segment_index_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/duration_segment_index_source.js b/lib/dash/duration_segment_index_source.js
index 4d2a7ca7af..627adc936a 100644
--- a/lib/dash/duration_segment_index_source.js
+++ b/lib/dash/duration_segment_index_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/dynamic_live_segment_index.js b/lib/dash/dynamic_live_segment_index.js
index 0ce7023696..2c9a6049c0 100644
--- a/lib/dash/dynamic_live_segment_index.js
+++ b/lib/dash/dynamic_live_segment_index.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/list_segment_index_source.js b/lib/dash/list_segment_index_source.js
index 351b064e3a..7868e4ea4f 100644
--- a/lib/dash/list_segment_index_source.js
+++ b/lib/dash/list_segment_index_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/live_segment_index.js b/lib/dash/live_segment_index.js
index 0b32f97986..09b282a6e3 100644
--- a/lib/dash/live_segment_index.js
+++ b/lib/dash/live_segment_index.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/mpd_parser.js b/lib/dash/mpd_parser.js
index 7ba89ec432..07aa1998d5 100644
--- a/lib/dash/mpd_parser.js
+++ b/lib/dash/mpd_parser.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/mpd_processor.js b/lib/dash/mpd_processor.js
index 246dff643a..018949ca01 100644
--- a/lib/dash/mpd_processor.js
+++ b/lib/dash/mpd_processor.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/mpd_request.js b/lib/dash/mpd_request.js
index c439ab0170..a1a21cb9aa 100644
--- a/lib/dash/mpd_request.js
+++ b/lib/dash/mpd_request.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/mpd_utils.js b/lib/dash/mpd_utils.js
index 8a90d8b74a..c52633812a 100644
--- a/lib/dash/mpd_utils.js
+++ b/lib/dash/mpd_utils.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/dash/timeline_segment_index_source.js b/lib/dash/timeline_segment_index_source.js
index 27e32b77e4..897a6cd556 100644
--- a/lib/dash/timeline_segment_index_source.js
+++ b/lib/dash/timeline_segment_index_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/debug/asserts.js b/lib/debug/asserts.js
index 9bdf49a51e..a09367f5da 100644
--- a/lib/debug/asserts.js
+++ b/lib/debug/asserts.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/debug/log.js b/lib/debug/log.js
index bc42d2f43c..5968e0e2c5 100644
--- a/lib/debug/log.js
+++ b/lib/debug/log.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/debug/timer.js b/lib/debug/timer.js
index e50df72981..cb8ec58e4c 100644
--- a/lib/debug/timer.js
+++ b/lib/debug/timer.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/eme_manager.js b/lib/media/eme_manager.js
index 352dbb1e56..28a00a77ff 100644
--- a/lib/media/eme_manager.js
+++ b/lib/media/eme_manager.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/i_abr_manager.js b/lib/media/i_abr_manager.js
index 47d468b14d..fe1c4256bd 100644
--- a/lib/media/i_abr_manager.js
+++ b/lib/media/i_abr_manager.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/i_segment_index_source.js b/lib/media/i_segment_index_source.js
index 94d80f61ef..8c7f1acc5d 100644
--- a/lib/media/i_segment_index_source.js
+++ b/lib/media/i_segment_index_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/i_stream.js b/lib/media/i_stream.js
index e4315a2734..c585622aec 100644
--- a/lib/media/i_stream.js
+++ b/lib/media/i_stream.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/manifest_updater.js b/lib/media/manifest_updater.js
index d19fb441c0..62e223a719 100644
--- a/lib/media/manifest_updater.js
+++ b/lib/media/manifest_updater.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/mp4_segment_index_parser.js b/lib/media/mp4_segment_index_parser.js
index 861b58ca1a..89a338b39e 100644
--- a/lib/media/mp4_segment_index_parser.js
+++ b/lib/media/mp4_segment_index_parser.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/offline_segment_index_source.js b/lib/media/offline_segment_index_source.js
index daeddfc9df..61da20bfa0 100644
--- a/lib/media/offline_segment_index_source.js
+++ b/lib/media/offline_segment_index_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/segment_index.js b/lib/media/segment_index.js
index 0c51d4ab35..f176a0c158 100644
--- a/lib/media/segment_index.js
+++ b/lib/media/segment_index.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/segment_init_source.js b/lib/media/segment_init_source.js
index 4d536f9b4d..5a5569db2a 100644
--- a/lib/media/segment_init_source.js
+++ b/lib/media/segment_init_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/segment_reference.js b/lib/media/segment_reference.js
index 6cc3dba1a8..f2091788ca 100644
--- a/lib/media/segment_reference.js
+++ b/lib/media/segment_reference.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/simple_abr_manager.js b/lib/media/simple_abr_manager.js
index 8680fad909..aed8d7de2c 100644
--- a/lib/media/simple_abr_manager.js
+++ b/lib/media/simple_abr_manager.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/source_buffer_manager.js b/lib/media/source_buffer_manager.js
index f95fce51fb..3f97d08eb2 100644
--- a/lib/media/source_buffer_manager.js
+++ b/lib/media/source_buffer_manager.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/stream.js b/lib/media/stream.js
index a34aacc2d1..4172324346 100644
--- a/lib/media/stream.js
+++ b/lib/media/stream.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/stream_info.js b/lib/media/stream_info.js
index f3331d4db8..e92295f5e7 100644
--- a/lib/media/stream_info.js
+++ b/lib/media/stream_info.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/stream_info_processor.js b/lib/media/stream_info_processor.js
index feaddf3d0b..b2593dbbf4 100644
--- a/lib/media/stream_info_processor.js
+++ b/lib/media/stream_info_processor.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/text_segment_index_source.js b/lib/media/text_segment_index_source.js
index c8a3e6398d..37573a8b42 100644
--- a/lib/media/text_segment_index_source.js
+++ b/lib/media/text_segment_index_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/text_stream.js b/lib/media/text_stream.js
index 2d6ba21b7c..8796b90174 100644
--- a/lib/media/text_stream.js
+++ b/lib/media/text_stream.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/media/webm_segment_index_parser.js b/lib/media/webm_segment_index_parser.js
index 75b10377e1..6c448fb565 100644
--- a/lib/media/webm_segment_index_parser.js
+++ b/lib/media/webm_segment_index_parser.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/audio_track.js b/lib/player/audio_track.js
index 68bbcd25ab..f9d577914a 100644
--- a/lib/player/audio_track.js
+++ b/lib/player/audio_track.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/dash_video_source.js b/lib/player/dash_video_source.js
index e79751bb14..c41204200b 100644
--- a/lib/player/dash_video_source.js
+++ b/lib/player/dash_video_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/defaults.js b/lib/player/defaults.js
index 77149b9c8e..203a8269f2 100644
--- a/lib/player/defaults.js
+++ b/lib/player/defaults.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/drm_info.js b/lib/player/drm_info.js
index 9a3f0a4654..870aafd3f9 100644
--- a/lib/player/drm_info.js
+++ b/lib/player/drm_info.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/drm_scheme_info.js b/lib/player/drm_scheme_info.js
index d71b0ba3ac..71b455b71a 100644
--- a/lib/player/drm_scheme_info.js
+++ b/lib/player/drm_scheme_info.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/http_video_source.js b/lib/player/http_video_source.js
index 2a862e3dd2..de0e851be6 100644
--- a/lib/player/http_video_source.js
+++ b/lib/player/http_video_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/i_video_source.js b/lib/player/i_video_source.js
index 59a9aa4a28..e7ebe8f3bf 100644
--- a/lib/player/i_video_source.js
+++ b/lib/player/i_video_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/offline_video_source.js b/lib/player/offline_video_source.js
index 075bee8400..e65e113142 100644
--- a/lib/player/offline_video_source.js
+++ b/lib/player/offline_video_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/player.js b/lib/player/player.js
index 377d4256a4..f6d3eb08a6 100644
--- a/lib/player/player.js
+++ b/lib/player/player.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/restrictions.js b/lib/player/restrictions.js
index a61d137474..2e1e852d12 100644
--- a/lib/player/restrictions.js
+++ b/lib/player/restrictions.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/stats.js b/lib/player/stats.js
index 4689156541..19d94d5c38 100644
--- a/lib/player/stats.js
+++ b/lib/player/stats.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/stream_video_source.js b/lib/player/stream_video_source.js
index 50382de485..adfceadc0e 100644
--- a/lib/player/stream_video_source.js
+++ b/lib/player/stream_video_source.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/text_style.js b/lib/player/text_style.js
index ac85fcc70b..ab8fcc3919 100644
--- a/lib/player/text_style.js
+++ b/lib/player/text_style.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/text_track.js b/lib/player/text_track.js
index 0bf6111add..2d826dc859 100644
--- a/lib/player/text_track.js
+++ b/lib/player/text_track.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/player/video_track.js b/lib/player/video_track.js
index 80ec110291..9fa48a70ac 100644
--- a/lib/player/video_track.js
+++ b/lib/player/video_track.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/polyfill/all.js b/lib/polyfill/all.js
index 2f4cbb085f..f678f91483 100644
--- a/lib/polyfill/all.js
+++ b/lib/polyfill/all.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/polyfill/customevent.js b/lib/polyfill/customevent.js
index ebad88f6ba..d4f076499b 100644
--- a/lib/polyfill/customevent.js
+++ b/lib/polyfill/customevent.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/polyfill/fullscreen.js b/lib/polyfill/fullscreen.js
index e262e90023..19c4118ae9 100644
--- a/lib/polyfill/fullscreen.js
+++ b/lib/polyfill/fullscreen.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/polyfill/mediakeys.js b/lib/polyfill/mediakeys.js
index 3ff7aabec0..05248bf5a9 100644
--- a/lib/polyfill/mediakeys.js
+++ b/lib/polyfill/mediakeys.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/polyfill/patchedmediakeys_nop.js b/lib/polyfill/patchedmediakeys_nop.js
index ca8425af32..0b09fd6f0a 100644
--- a/lib/polyfill/patchedmediakeys_nop.js
+++ b/lib/polyfill/patchedmediakeys_nop.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/polyfill/patchedmediakeys_v01b.js b/lib/polyfill/patchedmediakeys_v01b.js
index ba96337814..1abd8a8898 100644
--- a/lib/polyfill/patchedmediakeys_v01b.js
+++ b/lib/polyfill/patchedmediakeys_v01b.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/polyfill/videoplaybackquality.js b/lib/polyfill/videoplaybackquality.js
index c225015119..276dcf09d9 100644
--- a/lib/polyfill/videoplaybackquality.js
+++ b/lib/polyfill/videoplaybackquality.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/ajax_request.js b/lib/util/ajax_request.js
index da72509a3b..64f908b16a 100644
--- a/lib/util/ajax_request.js
+++ b/lib/util/ajax_request.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/array_utils.js b/lib/util/array_utils.js
index 24eaa064bb..6f2ce5601a 100644
--- a/lib/util/array_utils.js
+++ b/lib/util/array_utils.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/clock.js b/lib/util/clock.js
index c0af910283..64e81f9b80 100644
--- a/lib/util/clock.js
+++ b/lib/util/clock.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/content_database.js b/lib/util/content_database.js
index 822a4c35db..0b7d2f764e 100644
--- a/lib/util/content_database.js
+++ b/lib/util/content_database.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/content_database_reader.js b/lib/util/content_database_reader.js
index b182f6e5ef..03fbd7da0a 100644
--- a/lib/util/content_database_reader.js
+++ b/lib/util/content_database_reader.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/content_database_writer.js b/lib/util/content_database_writer.js
index 6b1b91d622..dc9fbc89d7 100644
--- a/lib/util/content_database_writer.js
+++ b/lib/util/content_database_writer.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/data_view_reader.js b/lib/util/data_view_reader.js
index e52c4c71ea..9b101100b5 100644
--- a/lib/util/data_view_reader.js
+++ b/lib/util/data_view_reader.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/ebml_parser.js b/lib/util/ebml_parser.js
index b9386896d7..e4f3efcd32 100644
--- a/lib/util/ebml_parser.js
+++ b/lib/util/ebml_parser.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/eme_utils.js b/lib/util/eme_utils.js
index 50a3db5d18..d7abbd32e7 100644
--- a/lib/util/eme_utils.js
+++ b/lib/util/eme_utils.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/event_manager.js b/lib/util/event_manager.js
index ccf7b4ac6a..ac0c67b494 100644
--- a/lib/util/event_manager.js
+++ b/lib/util/event_manager.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/ewma.js b/lib/util/ewma.js
index 9b04484683..2f8b2ba0e3 100644
--- a/lib/util/ewma.js
+++ b/lib/util/ewma.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/ewma_bandwidth_estimator.js b/lib/util/ewma_bandwidth_estimator.js
index 96c15b069e..44c08b2c92 100644
--- a/lib/util/ewma_bandwidth_estimator.js
+++ b/lib/util/ewma_bandwidth_estimator.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/failover_uri.js b/lib/util/failover_uri.js
index 7a74a53caf..6606d86c90 100644
--- a/lib/util/failover_uri.js
+++ b/lib/util/failover_uri.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/fake_event.js b/lib/util/fake_event.js
index 9d7e27ffa2..459aaffe55 100644
--- a/lib/util/fake_event.js
+++ b/lib/util/fake_event.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/fake_event_target.js b/lib/util/fake_event_target.js
index 309c932755..6ab0aaaab4 100644
--- a/lib/util/fake_event_target.js
+++ b/lib/util/fake_event_target.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/features.js b/lib/util/features.js
index cc70cfeb81..6fba008f27 100644
--- a/lib/util/features.js
+++ b/lib/util/features.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/i_bandwidth_estimator.js b/lib/util/i_bandwidth_estimator.js
index f63947e899..3182fef57c 100644
--- a/lib/util/i_bandwidth_estimator.js
+++ b/lib/util/i_bandwidth_estimator.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/language_utils.js b/lib/util/language_utils.js
index c8384f0794..9a495d9a7b 100644
--- a/lib/util/language_utils.js
+++ b/lib/util/language_utils.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/license_request.js b/lib/util/license_request.js
index de6f811bf4..ede11c73ae 100644
--- a/lib/util/license_request.js
+++ b/lib/util/license_request.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/map_utils.js b/lib/util/map_utils.js
index 78b987a0ac..b161754b18 100644
--- a/lib/util/map_utils.js
+++ b/lib/util/map_utils.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/multi_map.js b/lib/util/multi_map.js
index 000e4601b5..3493e691f7 100644
--- a/lib/util/multi_map.js
+++ b/lib/util/multi_map.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/pssh.js b/lib/util/pssh.js
index 712255034e..c399b628a8 100644
--- a/lib/util/pssh.js
+++ b/lib/util/pssh.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/public_promise.js b/lib/util/public_promise.js
index 47cdf1bb08..e9c6f3de6d 100644
--- a/lib/util/public_promise.js
+++ b/lib/util/public_promise.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/string_utils.js b/lib/util/string_utils.js
index 7b40c23bce..8ed57222f2 100644
--- a/lib/util/string_utils.js
+++ b/lib/util/string_utils.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/task.js b/lib/util/task.js
index eaeb2bbbd4..55e24a312f 100644
--- a/lib/util/task.js
+++ b/lib/util/task.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/typed_bind.js b/lib/util/typed_bind.js
index a9d72d51dc..962ed7d65b 100644
--- a/lib/util/typed_bind.js
+++ b/lib/util/typed_bind.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/util/uint8array_utils.js b/lib/util/uint8array_utils.js
index f9d12991ae..c8a4bde79d 100644
--- a/lib/util/uint8array_utils.js
+++ b/lib/util/uint8array_utils.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/load.js b/load.js
index ea9030ec38..5a6a17f8bc 100644
--- a/load.js
+++ b/load.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/shaka-player.uncompiled.js b/shaka-player.uncompiled.js
index ce3ac32a13..53faa38c35 100644
--- a/shaka-player.uncompiled.js
+++ b/shaka-player.uncompiled.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/ajax_request_spec.js b/spec/ajax_request_spec.js
index 8751c3f9ee..44b33055f0 100644
--- a/spec/ajax_request_spec.js
+++ b/spec/ajax_request_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/content_database_spec.js b/spec/content_database_spec.js
index 5ffac57e48..cbf09d2f95 100644
--- a/spec/content_database_spec.js
+++ b/spec/content_database_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/data_view_reader_spec.js b/spec/data_view_reader_spec.js
index 5353bffbb2..92b12cde85 100644
--- a/spec/data_view_reader_spec.js
+++ b/spec/data_view_reader_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/ebml_parser_spec.js b/spec/ebml_parser_spec.js
index bcd7170d37..f9b7a7dd57 100644
--- a/spec/ebml_parser_spec.js
+++ b/spec/ebml_parser_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/event_manager_spec.js b/spec/event_manager_spec.js
index 5d73a3f96e..696e2e0048 100644
--- a/spec/event_manager_spec.js
+++ b/spec/event_manager_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/fake_event_spec.js b/spec/fake_event_spec.js
index 684d2c8b55..ff9da61488 100644
--- a/spec/fake_event_spec.js
+++ b/spec/fake_event_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/language_utils_spec.js b/spec/language_utils_spec.js
index 2342386f0d..39e4762532 100644
--- a/spec/language_utils_spec.js
+++ b/spec/language_utils_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/license_request_spec.js b/spec/license_request_spec.js
index d23be7ce09..78274a51b1 100644
--- a/spec/license_request_spec.js
+++ b/spec/license_request_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/live_integration.js b/spec/live_integration.js
index 459a551711..7d560abc77 100644
--- a/spec/live_integration.js
+++ b/spec/live_integration.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/manifest_updater_spec.js b/spec/manifest_updater_spec.js
index d010182f96..3272a0c8c4 100644
--- a/spec/manifest_updater_spec.js
+++ b/spec/manifest_updater_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_base_url_spec.js b/spec/mpd_base_url_spec.js
index 6f069f647c..cb4ddd8258 100644
--- a/spec/mpd_base_url_spec.js
+++ b/spec/mpd_base_url_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_content_protection_spec.js b/spec/mpd_content_protection_spec.js
index 79a8d78bca..075ca1b4f2 100644
--- a/spec/mpd_content_protection_spec.js
+++ b/spec/mpd_content_protection_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_processor_spec.js b/spec/mpd_processor_spec.js
index dc79165c20..9dddec1de2 100644
--- a/spec/mpd_processor_spec.js
+++ b/spec/mpd_processor_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_segment_base_spec.js b/spec/mpd_segment_base_spec.js
index 9acca46988..8ca93095a9 100644
--- a/spec/mpd_segment_base_spec.js
+++ b/spec/mpd_segment_base_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_segment_list_spec.js b/spec/mpd_segment_list_spec.js
index 0a638ff380..f4d98f27d2 100644
--- a/spec/mpd_segment_list_spec.js
+++ b/spec/mpd_segment_list_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_segment_template_spec.js b/spec/mpd_segment_template_spec.js
index e1186ae94c..a45419abd2 100644
--- a/spec/mpd_segment_template_spec.js
+++ b/spec/mpd_segment_template_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_spec.js b/spec/mpd_spec.js
index 9e8f25e2bb..23a99620ca 100644
--- a/spec/mpd_spec.js
+++ b/spec/mpd_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/mpd_utils_spec.js b/spec/mpd_utils_spec.js
index 1d551043c8..d6643da7c0 100644
--- a/spec/mpd_utils_spec.js
+++ b/spec/mpd_utils_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/player_integration.js b/spec/player_integration.js
index 8f32d697cb..4854815b4b 100644
--- a/spec/player_integration.js
+++ b/spec/player_integration.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/pssh_spec.js b/spec/pssh_spec.js
index 4213c0474d..6761d6bdbb 100644
--- a/spec/pssh_spec.js
+++ b/spec/pssh_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/segment_index_parser_spec.js b/spec/segment_index_parser_spec.js
index 3639d26c94..3aef39fa11 100644
--- a/spec/segment_index_parser_spec.js
+++ b/spec/segment_index_parser_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/segment_index_spec.js b/spec/segment_index_spec.js
index da33f6ddbd..0f3b55749d 100644
--- a/spec/segment_index_spec.js
+++ b/spec/segment_index_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/task_spec.js b/spec/task_spec.js
index ae07ac0665..27090b7afa 100644
--- a/spec/task_spec.js
+++ b/spec/task_spec.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/util.js b/spec/util.js
index bbcdc257b7..90cba100b6 100644
--- a/spec/util.js
+++ b/spec/util.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2014 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/support.js b/support.js
index a9c248e4da..ce3791c2e5 100644
--- a/support.js
+++ b/support.js
@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");