clean up previous commit
more restrictive tree for generic accessors