Commented out unneeded fields and variables.  Pending deletion if things
are working as expected.