much debug, such cleanup