This commit removes the use of types in datafeeds and a few more places where it was possible. Relates #26968