remove dead code, typo, remove logs