More code cleanup.  Removed extraneous fields from models
More code cleanup.  Removed extraneous fields from models