moving comment closer to the thing it describes
dropping dead code