clarify comments, remove dead code