cleanup of model package