Revert "Trees v3.0"

This reverts commit c779e8624cfa0af91c0e6d5d486ef8b7ddcf9783.