Cleanup; validation/juggling fix