Add license notices where they were missing
Delete unused file
Merge remote-tracking branch 'origin/v2.5_branch'