Minor edits to take out leftover junk.