diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
deleted file mode 100644
index d5192e3f..00000000
--- a/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
-Built-By: Yonatan
-Build-Jdk: 1.6.0_35
-
diff --git a/META-INF/maven/org.openmrs.module/appointmentscheduling-api/pom.properties b/META-INF/maven/org.openmrs.module/appointmentscheduling-api/pom.properties
deleted file mode 100644
index 3a43e403..00000000
--- a/META-INF/maven/org.openmrs.module/appointmentscheduling-api/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Sat Jul 20 11:07:55 IDT 2013
-version=0.3
-groupId=org.openmrs.module
-artifactId=appointmentscheduling-api
diff --git a/META-INF/maven/org.openmrs.module/appointmentscheduling-api/pom.xml b/META-INF/maven/org.openmrs.module/appointmentscheduling-api/pom.xml
deleted file mode 100644
index 378ef3c9..00000000
--- a/META-INF/maven/org.openmrs.module/appointmentscheduling-api/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.openmrs.module</groupId>
-		<artifactId>appointmentscheduling</artifactId>
-		<version>0.3</version>
-	</parent>
-
-	<artifactId>appointmentscheduling-api</artifactId>
-	<packaging>jar</packaging>
-	<name>Appointment Scheduling Module API</name>
-	<description>API project for Appointment Scheduling</description>
-
-	<dependencies>
-	
-		<!-- 
-		Add other dependencies from parent's pom:
-		<dependency>
-			<groupId>org.other.library</groupId> 
-			<artifactId>library-name</artifactId>
-		</dependency> 
-		-->
-
-		
-		
-
-		<!-- Begin OpenMRS core -->
-		
-		<dependency>
-			<groupId>org.openmrs.api</groupId>
-			<artifactId>openmrs-api</artifactId>
-			<type>jar</type>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.openmrs.web</groupId>
-			<artifactId>openmrs-web</artifactId>
-			<type>jar</type>
-		</dependency>
-				
-		<dependency>
-			<groupId>org.openmrs.api</groupId>
-			<artifactId>openmrs-api</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.openmrs.web</groupId>
-			<artifactId>openmrs-web</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.openmrs.test</groupId>
-			<artifactId>openmrs-test</artifactId>
-			<type>pom</type>
-			<scope>test</scope>
-		</dependency>
-				
-		<!-- End OpenMRS core -->
-		
-	</dependencies>
-	
-	<build>
-		<plugins>
-            <plugin>
-                <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
-                <artifactId>maven-java-formatter-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                           <goal>format</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-				<filtering>true</filtering>
-			</testResource>
-		</testResources>
-	</build>
-
-</project>
diff --git a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java
index f1a339a9..fcf8d303 100644
--- a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java
@@ -33,7 +33,7 @@ public void shouldGetAppointmentBlockByUuid() throws Exception {
 		Assert.assertNotNull(result);
 		Assert.assertEquals(getUuid(), PropertyUtils.getProperty(result, "uuid"));
 		Assert.assertTrue(PropertyUtils.getProperty(result, "startDate").toString().contains("2005-01-01T00:00:00.00"));
-        Assert.assertTrue(PropertyUtils.getProperty(result, "endDate").toString().contains("2005-01-01T11:00:00.00"));
+		Assert.assertTrue(PropertyUtils.getProperty(result, "endDate").toString().contains("2005-01-01T11:00:00.00"));
 		Assert.assertEquals("Super User, Xanadu: 2005-01-01 00:00:00.0 - 2005-01-01 11:00:00.0",
 		    PropertyUtils.getProperty(result, "display"));
 		
@@ -59,8 +59,8 @@ public void shouldGetFullAppointmentBlockByUuid() throws Exception {
 		
 		Assert.assertNotNull(result);
 		Assert.assertEquals(getUuid(), PropertyUtils.getProperty(result, "uuid"));
-        Assert.assertTrue(PropertyUtils.getProperty(result, "startDate").toString().contains("2005-01-01T00:00:00.00"));
-        Assert.assertTrue(PropertyUtils.getProperty(result, "endDate").toString().contains("2005-01-01T11:00:00.00"));
+		Assert.assertTrue(PropertyUtils.getProperty(result, "startDate").toString().contains("2005-01-01T00:00:00.00"));
+		Assert.assertTrue(PropertyUtils.getProperty(result, "endDate").toString().contains("2005-01-01T11:00:00.00"));
 		Assert.assertEquals("Super User, Xanadu: 2005-01-01 00:00:00.0 - 2005-01-01 11:00:00.0",
 		    PropertyUtils.getProperty(result, "display"));
 		
@@ -91,9 +91,9 @@ public void shouldCreateNewAppointmentBlock() throws Exception {
 		
 		Object appt = deserialize(handle(req));
 		Assert.assertNotNull(PropertyUtils.getProperty(appt, "uuid"));
-        // TODO: figure out why the the lines below fails on bamboo
-        //Assert.assertTrue(PropertyUtils.getProperty(appt, "startDate").toString().contains("2005-03-01T00:00:00.00"));
-        //Assert.assertTrue(PropertyUtils.getProperty(appt, "endDate").toString().contains("2005-03-01T11:00:00.00"));
+		// TODO: figure out why the the lines below fails on bamboo
+		//Assert.assertTrue(PropertyUtils.getProperty(appt, "startDate").toString().contains("2005-03-01T00:00:00.00"));
+		//Assert.assertTrue(PropertyUtils.getProperty(appt, "endDate").toString().contains("2005-03-01T11:00:00.00"));
 		Assert.assertEquals("c0c54sd0-8e59-401d-8a4a-976a0b183599",
 		    PropertyUtils.getProperty(PropertyUtils.getProperty(appt, "provider"), "uuid"));
 		Assert.assertEquals("9356400c-a5a2-4532-8f2b-2361b3446eb8",
diff --git a/pom.xml b/pom.xml
index 92feaf7e..9ddc452c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,7 @@
 				<plugin>
 					<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
 					<artifactId>maven-java-formatter-plugin</artifactId>
+                    <version>0.4</version>
 					<configuration>
 						<compilerSource>${javaCompilerVersion}</compilerSource>
 						<compilerCompliance>${javaCompilerVersion}</compilerCompliance>