Bump copyright, remove spurious file
(cherry picked from commit 21a51525360341356b11d17259506011f42434ae)
Bump copyright, remove spurious file
(cherry picked from commit 21a51525360341356b11d17259506011f42434ae)