Backup debug cleanup #10