Remove usage of deprecated Model and Serializer fields (#1663)