Minor cleanup in unused file, copyright notices.