Added more debug on cleanup