ext: some more cleanup