Remove commentedout code, tweak comments.