remove dead code, add reviews