last bit of bugfix cleanup