Metadata cleanup and attached to group fixed