Remove extra left over file.
Merge remote-tracking branch 'origin/apache-ref/master' into champlain