debug info big cleanup