Support 0.14 and remove unneeded supervision tree