More cleanup on Dockerfile and start script.