Rewrite samples account in tree mode, more clear
Remove useless model