More clean up on the spec.