trim the fat

since this is basically a start-over