diff --git a/.travis.yml b/.travis.yml
index 7f46894..097bf43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,31 @@
 sudo: required
-dist: precise
+dist: trusty
 group: edge
 
-sudo: required
-
-language: java
-jdk:
-  - oraclejdk8
+language: go
+go:
+  - 1.5.2
+env:
+  - GOARCH=amd64
+gobuild_args:
 
 # whitelist
 branches:
   only:
-    - fix-hash-generator-pom
+    - dev
   except:
     - v-dev
 
-# add support for go, and python as well
-# before_install:
-#  # install go 1.5.2 and godep
-#  - wget https://storage.googleapis.com/golang/go1.5.2.linux-amd64.tar.gz
-#  - sudo tar -C /usr/local -xzf go1.5.2.linux-amd64.tar.gz
-#  - export GOROOT=/usr/local/go
-#  # Set GOPATH and Add Godeps dependencies to GOPATH and PATH
-#  - export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace"
-#  - export PATH=$GOROOT/bin:$PATH
-#  - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
-#  - go get github.com/tools/godep
- # TODO: if and when needed, enable python support and add it to CI, testing that the code works
- # install python
- # - sudo add-apt-repository ppa:fkrull/deadsnakes -y
- # - sudo apt-get update
- # - sudo apt-get -y install python2.7
+before_install:
+  - go get github.com/tools/godep
 
 install:
   - make all
 
-script:
-  - make test_java
+script: true
 
 cache:
   directories:
-    - $HOME/.m2
     - /usr/bin
 
 before_deploy:
@@ -48,7 +33,6 @@ before_deploy:
   - sudo wget https://github.com/benchflow/devops/raw/dev/ci/clean_v-dev_release.sh -O /usr/bin/clean_v-dev_release.sh
   - sudo chmod +x /usr/bin/clean_v-dev_release.sh
   - export REPO_NAME=commons
-  - export USER_NAME=simonedavico
   - /usr/bin/clean_v-dev_release.sh
 
 deploy:
@@ -56,14 +40,12 @@ deploy:
   api_key:
     secure: $GITHUB_ACCESS_TOKEN
   file:
-    - keyname-hash-generator/java/target/benchflow-keyname-hash-generator.jar
-    - minio/java/target/benchflow-minio-client.jar
-    # - docker/go/src/cloud/benchflow/commons/docker/docker.go
-    # - kafka/go/src/cloud/benchflow/commons/kafka/kafka.go
-    # - keyname-hash-generator/go/src/cloud/benchflow/commons/hashing/hashing.go
-    # - minio/go/src/cloud/benchflow/commons/minio/minio.go
+    - docker/go/src/cloud/benchflow/commons/docker/docker.go
+    - kafka/go/src/cloud/benchflow/commons/kafka/kafka.go
+    - keyname-hash-generator/go/src/cloud/benchflow/commons/hashing/hashing.go
+    - minio/go/src/cloud/benchflow/commons/minio/minio.go
   skip_cleanup: true
   on:
     tags: false
-    repo: simonedavico/commons
-    branch: fix-hash-generator-pom
+    repo: benchflow/commons
+    branch: dev
diff --git a/Makefile b/Makefile
index d2edea4..728112c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,10 @@
 REPONAME = commons
 DOCKERIMAGENAME = benchflow/$(REPONAME)
 VERSION = dev
-JAVA_VERSION_FOR_COMPILATION = (^|/)java-8-oracle($|\s)
-UNAME = $(shell uname)
 
-find_java:
-ifeq ($(UNAME), Darwin)
-	$(eval JAVA_HOME := $(shell /usr/libexec/java_home))
-else ifeq ($(UNAME),Linux)
-ifndef TRAVIS
-	$(eval JAVA_HOME := $(shell update-java-alternatives -l | cut -d' ' -f3 | egrep '$(JAVA_VERSION_FOR_COMPILATION)'))
-endif
-endif
+.PHONY: all build_release_go
 
-.PHONY: all build_release_java build_release_go
-
-all: build_release_java build_release_go
+all: build_release_go
 
 build_go:
 	$(MAKE) -C ./docker/go
@@ -23,32 +12,4 @@ build_go:
 	$(MAKE) -C ./keyname-hash-generator/go
 	$(MAKE) -C ./minio/go
 
-build_release_go: build_go
-
-clean_java:
-	cd keyname-hash-generator/java/ && \
-	JAVA_HOME=$(JAVA_HOME) mvn clean
-	$(MAKE) -C ./minio/java/ clean
-
-build_java:
-	cd keyname-hash-generator/java/ && \
-	JAVA_HOME=$(JAVA_HOME) mvn package
-	$(MAKE) -C ./minio/java/ build
-
-build_release_java:
-	# Install keyname-hash-generator so that can be used as dependency for the minio build
-	JAVA_HOME=$(JAVA_HOME) mvn package -pl minio/java -am install
-	# cd keyname-hash-generator/java/ && \
-	# JAVA_HOME=$(JAVA_HOME) mvn package && \
-	# JAVA_HOME=$(JAVA_HOME) mvn install
-	# $(MAKE) -C ./minio/java/ build_release
-
-install_java:
-	cd keyname-hash-generator/java/ && \
-	JAVA_HOME=$(JAVA_HOME) mvn install
-	$(MAKE) -C ./minio/java/ install
-
-test_java:
-	cd keyname-hash-generator/java/ && \
-	JAVA_HOME=$(JAVA_HOME) mvn test
-	$(MAKE) -C ./minio/java/ test
+build_release_go: build_go
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2aff6cf..23f1231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,4 @@
     	<java.version>1.8</java.version>
     </properties>
 
-    <modules>
-      <module>keyname-hash-generator/java</module>
-      <module>minio/java</module>
-    </modules>
-
 </project>