Remove autoconversion code from Map and POS models