Remove unnecessary conversions