removed old unnecessary fields.