cleanup; models work