diff --git a/.gitignore b/.gitignore
index 7d17b468937..d5c958ccade 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@
 /python/_virtualenv*
 /python/tidy/servo_tidy.egg-info
 /tests/wpt/sync
-*~
 *.pkl
 *.pyc
 *.swp
@@ -43,6 +42,10 @@ capture_webrender/
 .vscode
 !/.vscode/extensions.json
 
+# Emacs
+*~
+*#*
+
 /unminified-js
 
 # Hololens artifacts
diff --git a/components/webrender_surfman/#Cargo.toml# b/components/webrender_surfman/#Cargo.toml#
deleted file mode 100644
index 8370ff4457d..00000000000
--- a/components/webrender_surfman/#Cargo.toml#
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "webrender_surfman"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
-
-[lib]
-name = "webrender_surfman"
-path = "lib.rs"
-
-[dependencies]
-euclid = "0.20"
-surfman = "0.3"
-surfman-chains = "0.4i"
-
diff --git a/components/webrender_surfman/.#Cargo.toml b/components/webrender_surfman/.#Cargo.toml
deleted file mode 120000
index 0ab6459308a..00000000000
--- a/components/webrender_surfman/.#Cargo.toml
+++ /dev/null
@@ -1 +0,0 @@
-ajeffrey@ajeffrey-home.4753:1592856534
\ No newline at end of file