T/metadata cleanup