clean up swagger data-type processing
clean up swagger model and api-decl processing