Fixed pom.xml and removed uncecssary changes.