remove java-gateway, prepare for separate containers