Oops, more cleanup