even more cleanup, new java base image