Conversion cleanup.
Conversion spec cleanup.