Clean up Dockerfile more