Clean up model spec