Change copyright and remove an unnecessary file.
Merge in Nibu's changes.