Remove old functions
Split tree preference getter/setter into two separate functions