Cleanup; more framework.