Remove merge backup
Fix "deleting" a void*