Whoops, more cleanup