Remove conversion code