cleanup; wip org testing