Dockerfile clean-up