replace
bug fix
remove debug macro
bug fix
remove garbage code