Cleanup on Dockerfile