comment/dead code cleanup