remove a bunch of commented cruft from I11 gsp, handle error changes