- Dockerfile cleanups