Cleanup tree_status and use -z