Clean up conversions.
Clean up unused param.