Remove some old conversion functions