remove debug info and bug fix