removed extraneous extras, etc