diff --git a/.gitignore b/.gitignore
index 4cb85b5..74424b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,11 +136,10 @@ fabric.properties
 
 ### vscode ###
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
 *.code-workspace
 
 # Documentation
-doc/
\ No newline at end of file
+doc/
+
+# CLang
+compile_commands.json
\ No newline at end of file
diff --git a/update_upstream_and_merge_into_master.sh b/update_upstream_and_merge_into_master.sh
deleted file mode 100755
index d508df7..0000000
--- a/update_upstream_and_merge_into_master.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-git checkout upstream
-git pull https://github.com/pixlra/calyp.git master
-git push origin upstream
-
-git checkout master
-git pull origin master
-git merge upstream
-git push origin master
\ No newline at end of file