Old Tree implementation removed. General cleanup