Remove extra conversion step