Clean up of the Dockerfile