Node & RowTransformer cleanup