===> Cleaning for datadraw-3.1.1