tree - some cleaning