skip debugging message for tree files, more general cleanup