Dockerfile cleanup