diff --git a/.diff-exclude b/.diff-exclude
index fa71980ea8..9dae56afb5 100644
--- a/.diff-exclude
+++ b/.diff-exclude
@@ -1,11 +1,12 @@
 .hgignore
+.git
+.gitignore
 azure-pipelines.yml
 src/rev.cpp
 src/rev.cpp.in
 Makefile.src.in
-build-number.txt
 release_files
 make_diff.sh
 release.sh
 check_diff.sh
-novattd.sublime-project
+grf
diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index 163f545ffb..7ae06f1419 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -26,12 +26,14 @@ endif
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
 AI_DIR      = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
+DATA_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
 GAME_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/game
 BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
 LANG_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
 TTD_DIR     = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
 AI_DIR      = $(BUNDLE_DIR)/ai
+DATA_DIR    = $(BUNDLE_DIR)/data
 GAME_DIR    = $(BUNDLE_DIR)/game
 BASESET_DIR = $(BUNDLE_DIR)/baseset
 LANG_DIR    = $(BUNDLE_DIR)/lang
@@ -47,6 +49,7 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
+	$(Q)mkdir -p "$(DATA_DIR)"
 	$(Q)mkdir -p "$(GAME_DIR)"
 	$(Q)mkdir -p "$(BASESET_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
@@ -62,6 +65,7 @@ ifeq ($(OS),UNIX)
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/game/"compat_*.nut     "$(GAME_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.grf         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obg         "$(BASESET_DIR)/"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 18304d6746..d1d70e335f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,7 @@ jobs:
 
       # Rename the folder to openttd-NNN-source
       mkdir openttd-$(Build.BuildNumber)
-      find . -maxdepth 1 -not -name release_files -not -name . -not -name openttd-$(Build.BuildNumber) -exec mv {} openttd-$(Build.BuildNumber)/ \;
+      find . -maxdepth 1 -not -name release_files -not -name .git -not -name . -not -name openttd-$(Build.BuildNumber) -exec mv {} openttd-$(Build.BuildNumber)/ \;
       cp -r release_files/* openttd-$(Build.BuildNumber)/
 
       mkdir bundles
@@ -113,8 +113,6 @@ jobs:
       BuildConfiguration: Release
   - bash: |
       set -ex
-      mkdir -p bundle
-      cp -r bin/data bundle/
       make -f Makefile.msvc bundle_pdb bundle_zip PLATFORM=$(BundlePlatform) BUNDLE_NAME=citymania-client-$(Build.BuildNumber)-$(BundlePlatform)
     displayName: 'Create bundles'
   - task: PublishBuildArtifacts@1
diff --git a/bin/data/innerhighlight.grf b/bin/data/innerhighlight.grf
deleted file mode 100644
index d9c40b3c03..0000000000
Binary files a/bin/data/innerhighlight.grf and /dev/null differ
diff --git a/build-number.txt b/build-number.txt
deleted file mode 100644
index 561dee4ba1..0000000000
--- a/build-number.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created by the Bamboo Continuous Integration Server
-#Tue Oct 21 20:36:41 CEST 2014
-build.number=57
-build.timestamp="2014-10-21 20\:36\:41"
diff --git a/release.zip b/release.zip
deleted file mode 100644
index 4b73656ec0..0000000000
Binary files a/release.zip and /dev/null differ
diff --git a/release_files/bin/data/innerhighlight.grf b/release_files/bin/data/innerhighlight.grf
deleted file mode 100644
index c6eb932d81..0000000000
Binary files a/release_files/bin/data/innerhighlight.grf and /dev/null differ