diff --git a/.gitignore b/.gitignore
index 5f3c9db7f..b0684f207 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,23 @@
+# OS
 .DS_Store
 *.swp
 *.swo
+.vscode
+
+# Build
 vendor
-merkleeyes.db
 build
-docs/guide/*.sh
 tools/bin/*
 examples/build/*
-examples/basecoin/glide.lock
+docs/_build
+
+# Data - ideally these don't exist
 examples/basecoin/app/data
 baseapp/data/*
-docs/_build
-.DS_Store
+
+# Testing
 coverage.txt
 profile.out
-.vscode
-coverage.txt
-profile.out
-client/lcd/keys.db/
 
 ### Vagrant ###
 .vagrant/
diff --git a/client/lcd/.gitignore b/client/lcd/.gitignore
deleted file mode 100644
index ae9067025..000000000
--- a/client/lcd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tmp-base*
\ No newline at end of file