Dockerfile clean up