Cleanup of Dockerfile