remove dead code, comment cleanup