diff --git a/.gitignore b/.gitignore
index 636fb2f..b4129bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,34 +11,27 @@
 ittest
 asterix_logs
 build
-bin
-asterixdb/asterix-opt/
-asterixdb/asterix-app/src/test/resources/externallib/
-asterixdb/asterix-app/rttest/
-asterixdb/asterix-app/mdtest/
-asterixdb/asterix-app/opttest/
-asterixdb/asterix-app/parserts/
-asterixdb/asterix-app/library/
-asterixdb/asterix-app/opt_parserts/
-asterixdb/asterix-app/runtime_parserts/
+asterixdb/asterix-opt
+asterixdb/asterix-app/src/test/resources/externallib
+asterixdb/asterix-app/rttest
+asterixdb/asterix-app/mdtest
+asterixdb/asterix-app/opttest
+asterixdb/asterix-app/parserts
+asterixdb/asterix-app/library
+asterixdb/asterix-app/opt_parserts
+asterixdb/asterix-app/runtime_parserts
 asterixdb/asterix-app/data/csv/beer.csv
-asterixdb/asterix-installer/ittest/
-asterixdb/asterix-installer/repliationtest/
-asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly/
-build
-asterix_logs
-bin/
+asterixdb/asterix-installer/ittest
+asterixdb/asterix-installer/repliationtest
+asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly
 *-coredump
 *.pyc
 *.iml
-asterix-app/data/csv/beer.csv
-.idea/
-asterix.ipr
-asterix.iws
+.idea
+*.ipr
+*.iws
 git.properties
 actual
-build
-edu.uci.ics.hyracks.control.nc.NodeControllerService
 exception
 expected
 teststore1
@@ -54,8 +47,6 @@
 output
 tmp
 dist
-*.iml
-.idea/
-asterixdb/asterix-opt
 *~
-
+*.swp
+.m2*