Minor cleanup and removal of obsolete comments.