I guess it's a bit controversial, and not unique to your branch, but...

Do we want to keep this file header?