diff --git a/.gitignore b/.gitignore
index 44db12e7b63c6fda6361f5be01af9e45a3c5b285..247fbc63a92982a53a3b872572a5c354a51fd19d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-.DS_Store
-jvm/*
-webserver/x_desktop_web/.idea/*
\ No newline at end of file
+/o2cloud/
\ No newline at end of file
diff --git a/o2server/.gitignore b/o2server/.gitignore
index f3de6a4d74c695b66275fccb1e0e25072cedc3cf..ab0c408ce98e19e8894adf92f0f732acd0e68050 100644
--- a/o2server/.gitignore
+++ b/o2server/.gitignore
@@ -1,3 +1,4 @@
.project
/local/
-/logs/
\ No newline at end of file
+/logs/
+/x_build_and_scratch/
\ No newline at end of file
diff --git a/o2server/pom.xml b/o2server/pom.xml
index 25901f097c540f17ea4fe672f676f7c7a9fd0f82..0ac97b77f2f5878df5ab687bc1b361a1a53e5b99 100644
--- a/o2server/pom.xml
+++ b/o2server/pom.xml
@@ -62,7 +62,6 @@
x_report_assemble_control
x_strategydeploy_assemble_control
x_program_center
- x_build_and_scratch
x_console